Revision 5cfb9950a13b01ef40c34c3d77274ba4a7254a82 authored by Jarno Rajahalme on 14 April 2019, 16:56:53 UTC, committed by Ian Vernon on 16 April 2019, 00:15:51 UTC
[ upstream commit 3c4c3c22c8c09fcdc6a6e196515f32afa2c8175e ] Replace the istio-cilium.yaml file with a new one, generated with helm using the updated Istio GSG. Replace the bookinfo manifests with ones newly generated with helm. Istio release 1.1.3 is not out yet, but we can use the 1.1.3 proxy with Istio 1.1.2 to get the path normalization fix in. Signed-off-by: Jarno Rajahalme <jarno@covalent.io> Signed-off-by: vagrant <vagrant@k8s1>
1 parent 172e1d8
Makefile
include Makefile.defs
include daemon/bpf.sha
SUBDIRS_CILIUM_CONTAINER = proxylib envoy plugins/cilium-cni bpf daemon cilium-health bugtool
ifdef LIBNETWORK_PLUGIN
SUBDIRS_CILIUM_CONTAINER += plugins/cilium-docker
endif
SUBDIRS = $(SUBDIRS_CILIUM_CONTAINER) operator plugins tools
GOFILES ?= $(subst _$(ROOT_DIR)/,,$(shell $(GO) list ./... | grep -v -e /vendor/ -e /contrib/))
TESTPKGS ?= $(subst github.com/cilium/cilium/,,$(shell $(GO) list ./... | grep -v '/api/v1\|/vendor\|/contrib' | grep -v -P 'test(?!/helpers/logutils)'))
GOLANGVERSION = $(shell $(GO) version 2>/dev/null | grep -Eo '(go[0-9].[0-9])')
GOLANG_SRCFILES=$(shell for pkg in $(subst github.com/cilium/cilium/,,$(GOFILES)); do find $$pkg -name *.go -print; done | grep -v vendor | sort | uniq)
BPF_FILES ?= $(shell git ls-files ../bpf/ | grep -v .gitignore | tr "\n" ' ')
BPF_SRCFILES=$(subst ../,,$(BPF_FILES))
SWAGGER_VERSION = v0.18.0
SWAGGER = $(CONTAINER_ENGINE_FULL) run --rm -v $(CURDIR):$(CURDIR) -w $(CURDIR) -e GOPATH=$(GOPATH) --entrypoint swagger quay.io/goswagger/swagger:$(SWAGGER_VERSION)
COVERPKG ?= ./...
GOTEST_BASE = -test.v -timeout 360s
GOTEST_UNIT_BASE = $(GOTEST_BASE) -check.vv
GOTEST_PRIV_OPTS = $(GOTEST_UNIT_BASE) -tags=privileged_tests
GOTEST_COVER_OPTS = -coverprofile=coverage.out -covermode=count -coverpkg $(COVERPKG)
BENCH ?= "."
BENCHFLAGS ?= -bench=$(BENCH) -run=^$ -benchtime=10s
JOB_BASE_NAME ?= cilium_test
UTC_DATE=$(shell date -u "+%Y-%m-%d")
# Since there's a bug with NFS or the kernel, the flock syscall hangs the documentation
# build in the developer VM. For this reason the documentation build is skipped if NFS
# is running in the developer VM.
SKIP_DOCS ?= $(shell if mount | grep -q "/home/vagrant/go/src/github.com/cilium/cilium type nfs"; then echo "true"; else echo "false"; fi)
TEST_LDFLAGS=-ldflags "-X github.com/cilium/cilium/pkg/kvstore.consulDummyAddress=https://consul:8443 \
-X github.com/cilium/cilium/pkg/kvstore.etcdDummyAddress=http://etcd:4002 \
-X github.com/cilium/cilium/pkg/testutils.CiliumRootDir=$(ROOT_DIR) \
-X github.com/cilium/cilium/pkg/datapath.DatapathSHA=1234567890abcdef7890"
TEST_UNITTEST_LDFLAGS= -ldflags "-X github.com/cilium/cilium/pkg/kvstore.consulDummyConfigFile=/tmp/cilium-consul-certs/cilium-consul.yaml \
-X github.com/cilium/cilium/pkg/testutils.CiliumRootDir=$(ROOT_DIR) \
-X github.com/cilium/cilium/pkg/datapath.DatapathSHA=1234567890abcdef7890"
all: precheck build postcheck
@echo "Build finished."
build: $(SUBDIRS)
build-container:
for i in $(SUBDIRS_CILIUM_CONTAINER); do $(MAKE) -C $$i all; done
$(SUBDIRS): force
@ $(MAKE) -C $@ all
jenkins-precheck:
docker-compose -f test/docker-compose.yml -p $(JOB_BASE_NAME)-$$BUILD_NUMBER run --rm precheck
clean-jenkins-precheck:
docker-compose -f test/docker-compose.yml -p $(JOB_BASE_NAME)-$$BUILD_NUMBER rm
# remove the networks
docker-compose -f test/docker-compose.yml -p $(JOB_BASE_NAME)-$$BUILD_NUMBER down
PRIV_TEST_PKGS ?= $(shell grep --include='*.go' -ril '+build privileged_tests' | xargs dirname | sort | uniq)
tests-privileged:
# cilium-map-migrate is a dependency of some unit tests.
$(MAKE) -C bpf cilium-map-migrate
$(QUIET)$(foreach pkg,$(PRIV_TEST_PKGS),\
$(GO) test $(TEST_LDFLAGS) github.com/cilium/cilium/$(pkg) $(GOTEST_PRIV_OPTS) || exit 1;)
start-kvstores:
@echo Starting key-value store containers...
-$(CONTAINER_ENGINE_FULL) rm -f "cilium-etcd-test-container" 2> /dev/null
$(CONTAINER_ENGINE_FULL) run -d \
--name "cilium-etcd-test-container" \
-p 4002:4001 \
quay.io/coreos/etcd:v3.2.17 \
etcd -name etcd0 \
-advertise-client-urls http://0.0.0.0:4001 \
-listen-client-urls http://0.0.0.0:4001 \
-listen-peer-urls http://0.0.0.0:2380 \
-initial-cluster-token etcd-cluster-1 \
-initial-cluster-state new
-$(CONTAINER_ENGINE_FULL) rm -f "cilium-consul-test-container" 2> /dev/null
rm -rf /tmp/cilium-consul-certs
mkdir /tmp/cilium-consul-certs
cp $(CURDIR)/test/consul/* /tmp/cilium-consul-certs
chmod -R a+rX /tmp/cilium-consul-certs
$(CONTAINER_ENGINE_FULL) run -d \
--name "cilium-consul-test-container" \
-p 8501:8443 \
-e 'CONSUL_LOCAL_CONFIG={"skip_leave_on_interrupt": true, "disable_update_check": true}' \
-v /tmp/cilium-consul-certs:/cilium-consul/ \
consul:1.1.0 \
agent -client=0.0.0.0 -server -bootstrap-expect 1 -config-file=/cilium-consul/consul-config.json
stop-kvstores:
$(CONTAINER_ENGINE_FULL) rm -f "cilium-etcd-test-container"
$(CONTAINER_ENGINE_FULL) rm -f "cilium-consul-test-container"
rm -rf /tmp/cilium-consul-certs
tests: force
$(MAKE) unit-tests
generate-cov:
# Remove generated code from coverage
$(QUIET) grep -Ev '(^github.com/cilium/cilium/api/v1)|(generated.deepcopy.go)|(^github.com/cilium/cilium/pkg/k8s/client/)' \
coverage-all-tmp.out > coverage-all.out
$(QUIET)$(GO) tool cover -html=coverage-all.out -o=coverage-all.html
$(QUIET) rm coverage.out coverage-all-tmp.out
unit-tests: start-kvstores
$(QUIET) $(MAKE) -C test/bpf/
$(QUIET) $(MAKE) -C daemon/ check-bindata
$(MAKE) govet
$(QUIET) echo "mode: count" > coverage-all-tmp.out
$(QUIET) echo "mode: count" > coverage.out
$(QUIET)$(foreach pkg,$(patsubst %,github.com/cilium/cilium/%,$(TESTPKGS)),\
$(GO) test $(TEST_UNITTEST_LDFLAGS) $(pkg) $(GOTEST_BASE) $(GOTEST_COVER_OPTS) || exit 1; \
tail -n +2 coverage.out >> coverage-all-tmp.out;)
$(MAKE) generate-cov
@rmdir ./daemon/1 ./daemon/1_backup 2> /dev/null || true
$(MAKE) stop-kvstores
bench: start-kvstores
$(QUIET)$(foreach pkg,$(patsubst %,github.com/cilium/cilium/%,$(TESTPKGS)),\
$(GO) test $(TEST_UNITTEST_LDFLAGS) $(GOTEST_BASE) $(BENCHFLAGS) \
$(pkg) \
|| exit 1;)
$(MAKE) stop-kvstores
bench-privileged:
$(QUIET)$(foreach pkg,$(patsubst %,github.com/cilium/cilium/%,$(TESTPKGS)),\
$(GO) test $(TEST_UNITTEST_LDFLAGS) $(GOTEST_BASE) $(BENCHFLAGS) \
-tags=privileged_tests $(pkg) \
|| exit 1;)
clean-tags:
@$(ECHO_CLEAN) tags
@-rm -f cscope.out cscope.in.out cscope.po.out cscope.files tags
tags: $(GOLANG_SRCFILES) $(BPF_SRCFILES) cscope.files
ctags $(GOLANG_SRCFILES) $(BPF_SRCFILES)
@ echo $(GOLANG_SRCFILES) $(BPF_SRCFILES) | sed 's/ /\n/g' | sort > cscope.files
cscope -R -b -q
clean-container:
-for i in $(SUBDIRS); do $(MAKE) -C $$i clean; done
clean: clean-container
-$(MAKE) -C ./contrib/packaging/deb clean
-$(MAKE) -C ./contrib/packaging/rpm clean
-rm -f GIT_VERSION
install:
$(INSTALL) -m 0755 -d $(DESTDIR)$(BINDIR)
for i in $(SUBDIRS); do $(MAKE) -C $$i install; done
install-container:
$(INSTALL) -m 0755 -d $(DESTDIR)$(BINDIR)
for i in $(SUBDIRS_CILIUM_CONTAINER); do $(MAKE) -C $$i install; done
# Workaround for not having git in the build environment
GIT_VERSION: .git
echo "$(GIT_VERSION)" >GIT_VERSION
docker-image: clean docker-image-no-clean docker-operator-image
docker-image-no-clean: GIT_VERSION
$(CONTAINER_ENGINE_FULL) build \
--build-arg LOCKDEBUG=${LOCKDEBUG} \
--build-arg V=${V} \
--build-arg LIBNETWORK_PLUGIN=${LIBNETWORK_PLUGIN} \
-t "cilium/cilium:$(DOCKER_IMAGE_TAG)" .
$(QUIET)echo "Push like this when ready:"
$(QUIET)echo "${CONTAINER_ENGINE} push cilium/cilium:$(DOCKER_IMAGE_TAG)"
dev-docker-image: GIT_VERSION
$(CONTAINER_ENGINE_FULL) build \
--build-arg LOCKDEBUG=${LOCKDEBUG} \
--build-arg V=${V} \
--build-arg LIBNETWORK_PLUGIN=${LIBNETWORK_PLUGIN} \
-t "cilium/cilium-dev:$(DOCKER_IMAGE_TAG)" .
$(QUIET)echo "Push like this when ready:"
$(QUIET)echo "${CONTAINER_ENGINE} push cilium/cilium-dev:$(DOCKER_IMAGE_TAG)"
docker-operator-image: GIT_VERSION
$(CONTAINER_ENGINE_FULL) build --build-arg LOCKDEBUG=${LOCKDEBUG} -f cilium-operator.Dockerfile -t "cilium/operator:$(DOCKER_IMAGE_TAG)" .
$(QUIET)echo "Push like this when ready:"
$(QUIET)echo "docker push cilium/operator:$(DOCKER_IMAGE_TAG)"
docker-image-init:
$(QUIET)cd contrib/packaging/docker && ${CONTAINER_ENGINE} build -t "cilium/cilium-init:$(UTC_DATE)" -f Dockerfile.init .
docker-image-runtime:
cd contrib/packaging/docker && ${CONTAINER_ENGINE} build -t "cilium/cilium-runtime:$(UTC_DATE)" -f Dockerfile.runtime .
docker-image-builder:
${CONTAINER_ENGINE_FULL} build -t "cilium/cilium-builder:$(UTC_DATE)" -f Dockerfile.builder .
build-deb:
$(MAKE) -C ./contrib/packaging/deb
build-rpm:
$(MAKE) -C ./contrib/packaging/rpm
runtime-tests:
$(MAKE) -C tests runtime-tests
k8s-tests:
$(MAKE) -C tests k8s-tests
generate-api: api/v1/openapi.yaml
@$(ECHO_GEN)api/v1/openapi.yaml
-$(SWAGGER) generate server -s server -a restapi \
-t api/v1 -f api/v1/openapi.yaml --default-scheme=unix -C api/v1/cilium-server.yml
-$(SWAGGER) generate client -a restapi \
-t api/v1 -f api/v1/openapi.yaml
generate-health-api: api/v1/health/openapi.yaml
@$(ECHO_GEN)api/v1/health/openapi.yaml
-$(SWAGGER) generate server -s server -a restapi \
-t api/v1 -t api/v1/health/ -f api/v1/health/openapi.yaml --default-scheme=unix -C api/v1/cilium-server.yml
-$(SWAGGER) generate client -a restapi \
-t api/v1 -t api/v1/health/ -f api/v1/health/openapi.yaml
generate-k8s-api:
cd "./vendor/k8s.io/code-generator" && \
./generate-groups.sh all \
github.com/cilium/cilium/pkg/k8s/client \
github.com/cilium/cilium/pkg/k8s/apis \
"cilium.io:v2" \
--go-header-file "$(PWD)/hack/custom-boilerplate.go.txt"
cd "./vendor/k8s.io/code-generator" && \
./generate-groups.sh deepcopy \
github.com/cilium/cilium/pkg/k8s/client \
github.com/cilium/cilium/pkg \
"policy:api" \
--go-header-file "$(PWD)/hack/custom-boilerplate.go.txt"
cd "./vendor/k8s.io/code-generator" && \
./generate-groups.sh deepcopy \
github.com/cilium/cilium/pkg/k8s/client \
github.com/cilium/cilium \
"pkg:node" \
--go-header-file "$(PWD)/hack/custom-boilerplate.go.txt"
cd "./vendor/k8s.io/code-generator" && \
./generate-groups.sh deepcopy \
github.com/cilium/cilium/pkg/k8s/client \
github.com/cilium/cilium \
"pkg:service" \
--go-header-file "$(PWD)/hack/custom-boilerplate.go.txt"
cd "./vendor/k8s.io/code-generator" && \
./generate-groups.sh deepcopy \
github.com/cilium/cilium/pkg/k8s/client \
github.com/cilium/cilium/api \
"v1:models" \
--go-header-file "$(PWD)/hack/custom-boilerplate.go.txt"
cd "./vendor/k8s.io/code-generator" && \
./generate-groups.sh deepcopy \
github.com/cilium/cilium/pkg/k8s/client \
github.com/cilium/cilium/pkg \
"k8s:types" \
--go-header-file "$(PWD)/hack/custom-boilerplate.go.txt"
vps:
VBoxManage list runningvms
reload:
sudo systemctl stop cilium cilium-docker
sudo $(MAKE) install
sudo systemctl start cilium cilium-docker
sleep 6
cilium status
release:
$(eval TAG_VERSION := $(shell git tag | grep v$(VERSION) > /dev/null; echo $$?))
$(eval BRANCH := $(shell git rev-parse --abbrev-ref HEAD))
$(info Checking if tag $(VERSION) is created '$(TAG_VERSION)' $(BRANCH))
@if [ "$(TAG_VERSION)" -eq "0" ];then { echo Git tag v$(VERSION) is already created; exit 1; } fi
$(MAKE) -C ./contrib/packaging/deb release
git commit -m "Version $(VERSION)"
git tag v$(VERSION)
git archive --format tar $(BRANCH) | gzip > ../cilium_$(VERSION).orig.tar.gz
gofmt:
$(QUIET)for pkg in $(GOFILES); do $(GO) fmt $$pkg; done
govet:
@$(ECHO_CHECK) vetting all GOFILES...
$(QUIET)$(GO) vet \
./api/... \
./bugtool/... \
./cilium/... \
./cilium-health/... \
./common/... \
./daemon/... \
./monitor/... \
./operator/... \
./pkg/... \
./plugins/... \
./proxylib/... \
./test/. \
./test/config/... \
./test/ginkgo-ext/... \
./test/helpers/... \
./test/runtime/... \
./test/k8sT/... \
./tools/...
ineffassign:
@$(ECHO_CHECK) ineffassign
$(QUIET) ineffassign .
logging-subsys-field:
@$(ECHO_CHECK) contrib/scripts/check-logging-subsys-field.sh
$(QUIET) contrib/scripts/check-logging-subsys-field.sh
check-microk8s:
@$(ECHO_CHECK) microk8s is ready...
$(QUIET)microk8s.status >/dev/null \
|| (echo "Error: Microk8s is not running" && exit 1)
$(QUIET)microk8s.status -o yaml | grep -q "registry.*enabled" \
|| (echo "Error: Microk8s registry must be enabled" && exit 1)
LOCAL_IMAGE_TAG=local
LOCAL_IMAGE=localhost:32000/cilium/cilium:$(LOCAL_IMAGE_TAG)
microk8s: check-microk8s
$(QUIET)$(MAKE) dev-docker-image DOCKER_IMAGE_TAG=$(LOCAL_IMAGE_TAG)
@echo " DPLOY image to microk8s ($(LOCAL_IMAGE))"
$(CONTAINER_ENGINE_FULL) tag cilium/cilium-dev:$(LOCAL_IMAGE_TAG) $(LOCAL_IMAGE)
$(CONTAINER_ENGINE_FULL) push $(LOCAL_IMAGE)
$(QUIET)kubectl apply -f contrib/k8s/microk8s-prepull.yaml
$(QUIET)kubectl -n kube-system delete pod -l name=prepull
$(QUIET)kubectl -n kube-system rollout status ds/prepull
@echo
@echo "Update image tag like this when ready:"
@echo " kubectl -n kube-system set image ds/cilium cilium-agent=$(LOCAL_IMAGE)"
@echo "Or, redeploy the Cilium pods:"
@echo " kubectl -n kube-system delete pod -l k8s-app=cilium"
precheck: ineffassign logging-subsys-field
@$(ECHO_CHECK) contrib/scripts/check-fmt.sh
$(QUIET) contrib/scripts/check-fmt.sh
@$(ECHO_CHECK) contrib/scripts/check-log-newlines.sh
$(QUIET) contrib/scripts/check-log-newlines.sh
@$(ECHO_CHECK) contrib/scripts/check-missing-tags-in-tests.sh
$(QUIET) contrib/scripts/check-missing-tags-in-tests.sh
@$(ECHO_CHECK) contrib/scripts/check-assert-deep-equals.sh
$(QUIET) contrib/scripts/check-assert-deep-equals.sh
pprof-help:
@echo "Available pprof targets:"
@echo " pprof-heap"
@echo " pprof-profile"
@echo " pprof-block"
@echo " pprof-trace-5s"
@echo " pprof-mutex"
pprof-heap:
$(QUIET)$(GO) tool pprof http://localhost:6060/debug/pprof/heap
pprof-profile:
$(QUIET)$(GO) tool pprof http://localhost:6060/debug/pprof/profile
pprof-block:
$(QUIET)$(GO) tool pprof http://localhost:6060/debug/pprof/block
pprof-trace-5s:
curl http://localhost:6060/debug/pprof/trace?seconds=5
pprof-mutex:
$(QUIET)$(GO) tool pprof http://localhost:6060/debug/pprof/mutex
update-authors:
@echo "Updating AUTHORS file..."
@echo "The following people, in alphabetical order, have either authored or signed" > AUTHORS
@echo "off on commits in the Cilium repository:" >> AUTHORS
@echo "" >> AUTHORS
@contrib/scripts/extract_authors.sh >> AUTHORS
@cat .authors.aux >> AUTHORS
docs-container:
$(QUIET)cp -r ./api ./Documentation/_api
$(CONTAINER_ENGINE_FULL) image build -t cilium/docs-builder -f Documentation/Dockerfile ./Documentation; \
(ret=$$?; rm -r ./Documentation/_api && exit $$ret)
render-docs: test-docs
$(CONTAINER_ENGINE_FULL) container run --rm -dit --name docs-cilium -p 9080:80 -v $$(pwd)/Documentation/_build/html/:/usr/local/apache2/htdocs/ httpd:2.4
@echo "$$(tput setaf 2)Running at http://localhost:9080$$(tput sgr0)"
test-docs: docs-container
-$(CONTAINER_ENGINE_FULL) container rm -f docs-cilium >/dev/null 2>&1 || true
$(CONTAINER_ENGINE_FULL) container run --rm -v $$(pwd):/srv/ cilium/docs-builder /bin/bash -c 'make html'
manpages:
-rm -r man
mkdir -p man
cilium cmdman -d man
install-manpages:
cp man/* /usr/local/share/man/man1/
mandb
# Strip "tabs assets" errors from the dummy target, but fail on target failure.
check-docs:
$(QUIET)($(MAKE) -C Documentation/ dummy SPHINXOPTS="$(SPHINXOPTS)" 2>&1 && touch $@.ok) \
| grep -v "tabs assets"
@rm $@.ok 2>/dev/null
postcheck: build
@$(ECHO_CHECK) contrib/scripts/check-cmdref.sh
$(QUIET) MAKE=$(MAKE) contrib/scripts/check-cmdref.sh
@$(ECHO_CHECK) contrib/scripts/lock-check.sh
$(QUIET) contrib/scripts/lock-check.sh
@$(SKIP_DOCS) || $(MAKE) check-docs
minikube:
$(QUIET) contrib/scripts/minikube.sh
.PHONY: force generate-api generate-health-api
force :;
Computing file changes ...