feat(kuma-cp) merge injector into kuma-cp (#701)

* feat(kuma-cp) merge injector into kuma-cp

* feat(kuma-cp) resolve review comments

* feat(kuma-cp) fix default kuma-cp config

* feat(kuma-cp) update env name

* feat(kuma-cp) make check

* chore(kuma-cp) rename envs according to the general style

* chore(kuma-cp) after-rebase commit

* chore(kuma-cp) after-rebase fix

* feat(kuma-cp) update CHANGELOG

.circleci/config.yml

@@ -351,7 +351,7 @@ jobs:
         # otherwise, fallback to the most recently generated cache on any branch
         - go.mod-
     - run:
-        name: Build all Kuma binaries (such as, kumactl, kuma-cp, kuma-dp, kuma-injector, kuma-prometheus-sd)
+        name: Build all Kuma binaries (such as, kumactl, kuma-cp, kuma-dp, kuma-prometheus-sd)
         command: make build
 
     # Persist the specified paths into the workspace for use in downstream jobs

CHANGELOG.md

@@ -1,6 +1,8 @@
 # CHANGELOG
 
 ## master
+* feat: merge injector into kuma-cp
+  [#701](https://github.com/Kong/kuma/pull/701)
 * feat: refactor other pars of the Mesh to be consistent with CA
   [#704](https://github.com/Kong/kuma/pull/704)
   ⚠️ warning: breaking change of Mesh model

CONTRIBUTING.md

@@ -121,8 +121,8 @@ to verify a few things:
 - Rebase your work on top of the base branch (seek help online on how to use
   `git rebase`; this is important to ensure your commit history is clean and
    linear)
-- The tests are passing: run `make test`, `make test konvoy-injector`,
-  `make test kuma-dp`, or whichever is appropriate for your change
+- The tests are passing: run `make test`, `make test kuma-dp`, or whichever is 
+  appropriate for your change
 - Do not update CHANGELOG.md yourself. Your change will be included there in
   due time if it is accepted, no worries!
 
@@ -228,7 +228,6 @@ it is at your discretion, but here are some of the most frequent ones:
 
 - **kuma-cp**: A change that affects the control-plane
 - **kuma-dp**: A change that affects the data-plane
-- **injector**: A change to the Kuma injector
 - **kumactl**: A change to the kumactl
 - **deps**: When updating dependencies (to be used with the `chore` prefix)
 - **conf**: Configuration-related changes (new values, improvements...)

DEVELOPER.md

@@ -230,8 +230,7 @@ make run/k8s
 
 #### Running Dataplane (Envoy)
 
-1. Run the instructions at "Pointing Envoy at Control Plane" section, so the `kuma-injector` is present in the KIND
-cluster and Dataplane descriptor is available in the Control Plane.
+1. Run the instructions at "Pointing Envoy at Control Plane" section, so the Dataplane descriptor is available in the Control Plane.
 
 2. Start `Envoy` on local machine (requires `envoy` binary to be on your `PATH`):
 

Makefile

@@ -1,19 +1,18 @@
 .PHONY: help clean clean/build clean/proto \
 		start/k8s start/kind start/control-plane/k8s \
 		deploy/example-app/k8s deploy/control-plane/k8s \
-		kind/load/control-plane kind/load/kuma-dp kind/load/kuma-injector kind/load/kuma-init \
+		kind/load/control-plane kind/load/kuma-dp kind/load/kuma-init \
 		generate protoc/plugins protoc/pkg/config/app/kumactl/v1alpha1 protoc/pkg/test/apis/sample/v1alpha1 generate/kumactl/install/k8s/control-plane generate/kumactl/install/k8s/metrics generate/kumactl/install/k8s/tracing generate/kuma-cp/migrations generate/gui \
 		fmt fmt/go fmt/proto vet golangci-lint imports check test integration build run/k8s run/universal/memory run/universal/postgres \
-		images image/kuma-cp image/kuma-dp image/kumactl image/kuma-injector image/kuma-init image/kuma-prometheus-sd \
-		docker/build docker/build/kuma-cp docker/build/kuma-dp docker/build/kumactl docker/build/kuma-injector docker/build/kuma-init docker/build/kuma-prometheus-sd \
-		docker/save docker/save/kuma-cp docker/save/kuma-dp docker/save/kumactl docker/save/kuma-injector docker/save/kuma-init docker/save/kuma-prometheus-sd \
-		docker/load docker/load/kuma-cp docker/load/kuma-dp docker/load/kumactl docker/load/kuma-injector docker/load/kuma-init docker/load/kuma-prometheus-sd \
-		build/kuma-cp build/kuma-dp build/kumactl build/kuma-injector build/kuma-init build/kuma-prometheus-sd \
-		build/kuma-cp/linux-amd64 build/kuma-dp/linux-amd64 build/kumactl/linux-amd64 build/kuma-injector/linux-amd64 build/kuma-prometheus-sd/linux-amd64 \
+		images image/kuma-cp image/kuma-dp image/kumactl image/kuma-init image/kuma-prometheus-sd \
+		docker/build docker/build/kuma-cp docker/build/kuma-dp docker/build/kumactl docker/build/kuma-init docker/build/kuma-prometheus-sd \
+		docker/save docker/save/kuma-cp docker/save/kuma-dp docker/save/kumactl docker/save/kuma-init docker/save/kuma-prometheus-sd \
+		docker/load docker/load/kuma-cp docker/load/kuma-dp docker/load/kumactl docker/load/kuma-init docker/load/kuma-prometheus-sd \
+		build/kuma-cp build/kuma-dp build/kumactl build/kuma-init build/kuma-prometheus-sd \
+		build/kuma-cp/linux-amd64 build/kuma-dp/linux-amd64 build/kumactl/linux-amd64 build/kuma-prometheus-sd/linux-amd64 \
 		docs _docs_ docs/kumactl \
 		run/example/envoy config_dump/example/envoy \
 		print/kubebuilder/test_assets \
-		generate/test/cert/kuma-injector run/kuma-injector \
 		run/kuma-dp
 
 PKG_LIST := ./... ./api/... ./pkg/plugins/resources/k8s/native/...
@@ -96,19 +95,17 @@ endif
 KUMA_CP_DOCKER_IMAGE_NAME ?= $(DOCKER_REGISTRY)/kuma-cp
 KUMA_DP_DOCKER_IMAGE_NAME ?= $(DOCKER_REGISTRY)/kuma-dp
 KUMACTL_DOCKER_IMAGE_NAME ?= $(DOCKER_REGISTRY)/kumactl
-KUMA_INJECTOR_DOCKER_IMAGE_NAME ?= $(DOCKER_REGISTRY)/kuma-injector
 KUMA_INIT_DOCKER_IMAGE_NAME ?= $(DOCKER_REGISTRY)/kuma-init
 KUMA_PROMETHEUS_SD_DOCKER_IMAGE_NAME ?= $(DOCKER_REGISTRY)/kuma-prometheus-sd
 
 export KUMA_CP_DOCKER_IMAGE ?= $(KUMA_CP_DOCKER_IMAGE_NAME):$(BUILD_INFO_VERSION)
 export KUMA_DP_DOCKER_IMAGE ?= $(KUMA_DP_DOCKER_IMAGE_NAME):$(BUILD_INFO_VERSION)
 export KUMACTL_DOCKER_IMAGE ?= $(KUMACTL_DOCKER_IMAGE_NAME):$(BUILD_INFO_VERSION)
-export KUMA_INJECTOR_DOCKER_IMAGE ?= $(KUMA_INJECTOR_DOCKER_IMAGE_NAME):$(BUILD_INFO_VERSION)
 export KUMA_INIT_DOCKER_IMAGE ?= $(KUMA_INIT_DOCKER_IMAGE_NAME):$(BUILD_INFO_VERSION)
 export KUMA_PROMETHEUS_SD_DOCKER_IMAGE ?= $(KUMA_PROMETHEUS_SD_DOCKER_IMAGE_NAME):$(BUILD_INFO_VERSION)
 
 ifeq ($(KUMACTL_INSTALL_USE_LOCAL_IMAGES),true)
-	KUMACTL_INSTALL_CONTROL_PLANE_IMAGES := --control-plane-image=$(KUMA_CP_DOCKER_IMAGE_NAME) --dataplane-image=$(KUMA_DP_DOCKER_IMAGE_NAME) --injector-image=$(KUMA_INJECTOR_DOCKER_IMAGE_NAME) --dataplane-init-image=$(KUMA_INIT_DOCKER_IMAGE_NAME)
+	KUMACTL_INSTALL_CONTROL_PLANE_IMAGES := --control-plane-image=$(KUMA_CP_DOCKER_IMAGE_NAME) --dataplane-image=$(KUMA_DP_DOCKER_IMAGE_NAME) --dataplane-init-image=$(KUMA_INIT_DOCKER_IMAGE_NAME)
 else
 	KUMACTL_INSTALL_CONTROL_PLANE_IMAGES :=
 endif
@@ -216,9 +213,6 @@ kind/load/control-plane: image/kuma-cp
 kind/load/kuma-dp: image/kuma-dp
 	kind load docker-image $(KUMA_DP_DOCKER_IMAGE) --name=kuma
 
-kind/load/kuma-injector: image/kuma-injector
-	kind load docker-image $(KUMA_INJECTOR_DOCKER_IMAGE) --name=kuma
-
 kind/load/kuma-init: image/kuma-init
 	kind load docker-image $(KUMA_INIT_DOCKER_IMAGE) --name=kuma
 
@@ -227,15 +221,12 @@ kind/load/kuma-prometheus-sd: image/kuma-prometheus-sd
 
 deploy/control-plane/k8s: build/kumactl
 	kumactl install control-plane $(KUMACTL_INSTALL_CONTROL_PLANE_IMAGES) | KUBECONFIG=$(KIND_KUBECONFIG)  kubectl apply -f -
-	KUBECONFIG=$(KIND_KUBECONFIG) kubectl delete -n kuma-system pod -l app=kuma-injector
-	KUBECONFIG=$(KIND_KUBECONFIG) kubectl wait --timeout=60s --for=condition=Available -n kuma-system deployment/kuma-injector
-	KUBECONFIG=$(KIND_KUBECONFIG) kubectl wait --timeout=60s --for=condition=Ready -n kuma-system pods -l app=kuma-injector
 	KUBECONFIG=$(KIND_KUBECONFIG) kubectl wait --timeout=60s --for=condition=Available -n kuma-system deployment/kuma-control-plane
 	KUBECONFIG=$(KIND_KUBECONFIG) kubectl wait --timeout=60s --for=condition=Ready -n kuma-system pods -l app=kuma-control-plane
 	KUBECONFIG=$(KIND_KUBECONFIG) kubectl delete -n $(EXAMPLE_NAMESPACE) pod -l app=example-app
 	KUBECONFIG=$(KIND_KUBECONFIG) kubectl wait --timeout=60s --for=condition=Ready -n $(EXAMPLE_NAMESPACE) pods -l app=example-app
 
-start/control-plane/k8s: kind/load/control-plane kind/load/kuma-dp kind/load/kuma-injector kind/load/kuma-init deploy/control-plane/k8s ## Bootstrap: Deploy Control Plane on Kubernetes (KIND)
+start/control-plane/k8s: kind/load/control-plane kind/load/kuma-dp kind/load/kuma-init deploy/control-plane/k8s ## Bootstrap: Deploy Control Plane on Kubernetes (KIND)
 
 clean: clean/build ## Dev: Clean
 
@@ -318,15 +309,12 @@ test/kuma-dp: test ## Dev: Run `kuma-dp` tests only
 test/kumactl: PKG_LIST=./app/kumactl/... ./pkg/config/app/kumactl/...
 test/kumactl: test ## Dev: Run `kumactl` tests only
 
-test/kuma-injector: PKG_LIST=./app/kuma-injector/... ./pkg/config/app/kuma-injector/...
-test/kuma-injector: test ## Dev: Run 'kuma injector' tests only
-
 integration: ## Dev: Run integration tests
 	mkdir -p "$(shell dirname "$(COVERAGE_INTEGRATION_PROFILE)")"
 	tools/test/run-integration-tests.sh '$(GO_TEST) -race -covermode=atomic -tags=integration -count=1 -coverpkg=./... -coverprofile=$(COVERAGE_INTEGRATION_PROFILE) $(PKG_LIST)'
 	go tool cover -html="$(COVERAGE_INTEGRATION_PROFILE)" -o "$(COVERAGE_INTEGRATION_REPORT_HTML)"
 
-build: build/kuma-cp build/kuma-dp build/kumactl build/kuma-injector build/kuma-prometheus-sd ## Dev: Build all binaries
+build: build/kuma-cp build/kuma-dp build/kumactl build/kuma-prometheus-sd ## Dev: Build all binaries
 
 build/kuma-cp: ## Dev: Build `Control Plane` binary
 	$(GO_BUILD) -o ${BUILD_ARTIFACTS_DIR}/kuma-cp/kuma-cp ./app/kuma-cp
@@ -337,9 +325,6 @@ build/kuma-dp: ## Dev: Build `kuma-dp` binary
 build/kumactl: ## Dev: Build `kumactl` binary
 	$(GO_BUILD) -o $(BUILD_ARTIFACTS_DIR)/kumactl/kumactl ./app/kumactl
 
-build/kuma-injector: ## Dev: Build `kuma-injector` binary
-	$(GO_BUILD) -o ${BUILD_ARTIFACTS_DIR}/kuma-injector/kuma-injector ./app/kuma-injector
-
 build/kuma-prometheus-sd: ## Dev: Build `kuma-prometheus-sd` binary
 	$(GO_BUILD) -o ${BUILD_ARTIFACTS_DIR}/kuma-prometheus-sd/kuma-prometheus-sd ./app/kuma-prometheus-sd
 
@@ -350,10 +335,10 @@ run/k8s: fmt vet ## Dev: Run Control Plane locally in Kubernetes mode
 	KUMA_GRPC_PORT=$(CP_GRPC_PORT) \
 	KUMA_ENVIRONMENT=kubernetes \
 	KUMA_STORE_TYPE=kubernetes \
-	KUMA_SDS_SERVER_TLS_CERT_FILE=app/kuma-injector/cmd/testdata/tls.crt \
-	KUMA_SDS_SERVER_TLS_KEY_FILE=app/kuma-injector/cmd/testdata/tls.key \
-	KUMA_KUBERNETES_ADMISSION_SERVER_PORT=$(CP_K8S_ADMISSION_PORT) \
-	KUMA_KUBERNETES_ADMISSION_SERVER_CERT_DIR=app/kuma-injector/cmd/testdata \
+	KUMA_SDS_SERVER_TLS_CERT_FILE=app/kuma-cp/cmd/testdata/tls.crt \
+	KUMA_SDS_SERVER_TLS_KEY_FILE=app/kuma-cp/cmd/testdata/tls.key \
+	KUMA_RUNTIME_KUBERNETES_ADMISSION_SERVER_PORT=$(CP_K8S_ADMISSION_PORT) \
+	KUMA_RUNTIME_KUBERNETES_ADMISSION_SERVER_CERT_DIR=app/kuma-cp/cmd/testdata \
 	$(GO_RUN) ./app/kuma-cp/main.go run --log-level=debug
 
 run/universal/memory: ## Dev: Run Control Plane locally in universal mode with in-memory store
@@ -425,7 +410,7 @@ run/example/envoy: build/kuma-dp build/kumactl ## Dev: Run Envoy configured agai
 config_dump/example/envoy: ## Dev: Dump effective configuration of example Envoy
 	curl -s localhost:$(ENVOY_ADMIN_PORT)/config_dump
 
-images: image/kuma-cp image/kuma-dp image/kumactl image/kuma-injector image/kuma-init image/kuma-prometheus-sd ## Dev: Rebuild all Docker images
+images: image/kuma-cp image/kuma-dp image/kumactl image/kuma-init image/kuma-prometheus-sd ## Dev: Rebuild all Docker images
 
 build/kuma-cp/linux-amd64:
 	GOOS=linux GOARCH=amd64 $(MAKE) build/kuma-cp
@@ -436,13 +421,10 @@ build/kuma-dp/linux-amd64:
 build/kumactl/linux-amd64:
 	GOOS=linux GOARCH=amd64 $(MAKE) build/kumactl
 
-build/kuma-injector/linux-amd64:
-	GOOS=linux GOARCH=amd64 $(MAKE) build/kuma-injector
-
 build/kuma-prometheus-sd/linux-amd64:
 	GOOS=linux GOARCH=amd64 $(MAKE) build/kuma-prometheus-sd
 
-docker/build: docker/build/kuma-cp docker/build/kuma-dp docker/build/kumactl docker/build/kuma-injector docker/build/kuma-init docker/build/kuma-prometheus-sd ## Dev: Build all Docker images using existing artifacts from build
+docker/build: docker/build/kuma-cp docker/build/kuma-dp docker/build/kumactl docker/build/kuma-init docker/build/kuma-prometheus-sd ## Dev: Build all Docker images using existing artifacts from build
 
 docker/build/kuma-cp: build/artifacts-linux-amd64/kuma-cp/kuma-cp ## Dev: Build `kuma-cp` Docker image using existing artifact
 	docker build -t $(KUMA_CP_DOCKER_IMAGE) -f tools/releases/dockerfiles/Dockerfile.kuma-cp .
@@ -453,9 +435,6 @@ docker/build/kuma-dp: build/artifacts-linux-amd64/kuma-dp/kuma-dp ## Dev: Build
 docker/build/kumactl: build/artifacts-linux-amd64/kumactl/kumactl ## Dev: Build `kumactl` Docker image using existing artifact
 	docker build -t $(KUMACTL_DOCKER_IMAGE) -f tools/releases/dockerfiles/Dockerfile.kumactl .
 
-docker/build/kuma-injector: build/artifacts-linux-amd64/kuma-injector/kuma-injector ## Dev: Build `kuma-injector` Docker image using existing artifact
-	docker build -t $(KUMA_INJECTOR_DOCKER_IMAGE) -f tools/releases/dockerfiles/Dockerfile.kuma-injector .
-
 docker/build/kuma-init: ## Dev: Build `kuma-init` Docker image using existing artifact
 	docker build -t $(KUMA_INIT_DOCKER_IMAGE) -f tools/releases/dockerfiles/Dockerfile.kuma-init .
 
@@ -468,16 +447,14 @@ image/kuma-dp: build/kuma-dp/linux-amd64 docker/build/kuma-dp ## Dev: Rebuild `k
 
 image/kumactl: build/kumactl/linux-amd64 docker/build/kumactl ## Dev: Rebuild `kumactl` Docker image
 
-image/kuma-injector: build/kuma-injector/linux-amd64 docker/build/kuma-injector ## Dev: Rebuild `kuma-injector` Docker image
-
 image/kuma-init: docker/build/kuma-init ## Dev: Rebuild `kuma-init` Docker image
 
 image/kuma-prometheus-sd: build/kuma-prometheus-sd/linux-amd64 docker/build/kuma-prometheus-sd ## Dev: Rebuild `kuma-prometheus-sd` Docker image
 
 ${BUILD_DOCKER_IMAGES_DIR}:
 	mkdir -p ${BUILD_DOCKER_IMAGES_DIR}
 
-docker/save: docker/save/kuma-cp docker/save/kuma-dp docker/save/kumactl docker/save/kuma-injector docker/save/kuma-init docker/save/kuma-prometheus-sd
+docker/save: docker/save/kuma-cp docker/save/kuma-dp docker/save/kumactl docker/save/kuma-init docker/save/kuma-prometheus-sd
 
 docker/save/kuma-cp: ${BUILD_DOCKER_IMAGES_DIR}
 	docker save --output ${BUILD_DOCKER_IMAGES_DIR}/kuma-cp.tar $(KUMA_CP_DOCKER_IMAGE)
@@ -488,16 +465,13 @@ docker/save/kuma-dp: ${BUILD_DOCKER_IMAGES_DIR}
 docker/save/kumactl: ${BUILD_DOCKER_IMAGES_DIR}
 	docker save --output ${BUILD_DOCKER_IMAGES_DIR}/kumactl.tar $(KUMACTL_DOCKER_IMAGE)
 
-docker/save/kuma-injector: ${BUILD_DOCKER_IMAGES_DIR}
-	docker save --output ${BUILD_DOCKER_IMAGES_DIR}/kuma-injector.tar $(KUMA_INJECTOR_DOCKER_IMAGE)
-
 docker/save/kuma-init: ${BUILD_DOCKER_IMAGES_DIR}
 	docker save --output ${BUILD_DOCKER_IMAGES_DIR}/kuma-init.tar $(KUMA_INIT_DOCKER_IMAGE)
 
 docker/save/kuma-prometheus-sd: ${BUILD_DOCKER_IMAGES_DIR}
 	docker save --output ${BUILD_DOCKER_IMAGES_DIR}/kuma-prometheus-sd.tar $(KUMA_PROMETHEUS_SD_DOCKER_IMAGE)
 
-docker/load: docker/load/kuma-cp docker/load/kuma-dp docker/load/kumactl docker/load/kuma-injector docker/load/kuma-init docker/load/kuma-prometheus-sd
+docker/load: docker/load/kuma-cp docker/load/kuma-dp docker/load/kumactl docker/load/kuma-init docker/load/kuma-prometheus-sd
 
 docker/load/kuma-cp: ${BUILD_DOCKER_IMAGES_DIR}/kuma-cp.tar
 	docker load --input ${BUILD_DOCKER_IMAGES_DIR}/kuma-cp.tar
@@ -508,9 +482,6 @@ docker/load/kuma-dp: ${BUILD_DOCKER_IMAGES_DIR}/kuma-dp.tar
 docker/load/kumactl: ${BUILD_DOCKER_IMAGES_DIR}/kumactl.tar
 	docker load --input ${BUILD_DOCKER_IMAGES_DIR}/kumactl.tar
 
-docker/load/kuma-injector: ${BUILD_DOCKER_IMAGES_DIR}/kuma-injector.tar
-	docker load --input ${BUILD_DOCKER_IMAGES_DIR}/kuma-injector.tar
-
 docker/load/kuma-init: ${BUILD_DOCKER_IMAGES_DIR}/kuma-init.tar
 	docker load --input ${BUILD_DOCKER_IMAGES_DIR}/kuma-init.tar
 
@@ -551,20 +522,6 @@ print/kubebuilder/test_assets: ## Dev: Print Kubebuilder Environment variables
 	@echo export TEST_ASSET_ETCD=$(TEST_ASSET_ETCD)
 	@echo export TEST_ASSET_KUBECTL=$(TEST_ASSET_KUBECTL)
 
-generate/test/cert/kuma-injector:  ## Dev: Generate TLS cert for Kuma Injector (for use in development and unit tests)
-	OUTPUT_DIR=$(shell pwd)/app/kuma-injector/cmd/testdata && \
-	TMP_DIR=$(shell mktemp -d) && \
-	cd $$TMP_DIR && \
-	go run $(shell go env GOROOT)/src/crypto/tls/generate_cert.go --host=*.kuma-system.svc,*.kuma-system,localhost --duration=87660h && \
-	mv cert.pem $$OUTPUT_DIR/tls.crt && \
-	mv key.pem $$OUTPUT_DIR/tls.key && \
-	rm -rf $$TMP_DIR
-
-run/kuma-injector: ## Dev: Run Kuma Injector locally
-	KUBECONFIG=$(KIND_KUBECONFIG) \
-	KUMA_INJECTOR_WEBHOOK_SERVER_CERT_DIR=$(shell pwd)/app/kuma-injector/cmd/testdata \
-	$(GO_RUN) ./app/kuma-injector/main.go run --log-level=debug
-
 run/kuma-dp: ## Dev: Run `kuma-dp` locally
 	KUMA_DATAPLANE_MESH=$(EXAMPLE_DATAPLANE_MESH) \
 	KUMA_DATAPLANE_NAME=$(EXAMPLE_DATAPLANE_NAME) \

Makefile.e2e.mk

@@ -47,7 +47,6 @@ define pull_docker_images
 		&& set -x \
 		&& docker pull $(KUMA_CP_DOCKER_IMAGE) \
 		&& docker pull $(KUMA_DP_DOCKER_IMAGE) \
-		&& docker pull $(KUMA_INJECTOR_DOCKER_IMAGE) \
 		&& docker pull $(KUMA_INIT_DOCKER_IMAGE) \
 		&& docker pull $(KUMA_PROMETHEUS_SD_DOCKER_IMAGE) \
 		&& docker pull $(KUMACTL_DOCKER_IMAGE) \
@@ -317,8 +316,6 @@ load/example/minikube: ## Minikube: Load Docker images into Minikube
 deploy/kuma/minikube: ## Minikube: Deploy Kuma with no demo app
 	eval $$(minikube docker-env) && $(call pull_docker_images)
 	eval $$(minikube docker-env) && docker run --rm $(KUMACTL_DOCKER_IMAGE) kumactl install control-plane $(KUMACTL_INSTALL_CONTROL_PLANE_IMAGES) | kubectl apply -f -
-	kubectl wait --timeout=60s --for=condition=Available -n kuma-system deployment/kuma-injector
-	kubectl wait --timeout=60s --for=condition=Ready -n kuma-system pods -l app=kuma-injector
 	kubectl wait --timeout=60s --for=condition=Available -n kuma-system deployment/kuma-control-plane
 	kubectl wait --timeout=60s --for=condition=Ready -n kuma-system pods -l app=kuma-control-plane
 

app/kuma-cp/cmd/cmd_k8s_test.go

@@ -74,6 +74,6 @@ guiServer:
   port: 0
 `,
 			admissionServerPort,
-			filepath.Join("..", "..", "kuma-injector", "cmd", "testdata"))
+			filepath.Join("testdata"))
 	}))
 })