deploy operator into kind during e2e tests so it can access any pod/service inside kind

On-behalf-of: @SAP [email protected]

Author: xrstf

Makefile

@@ -127,27 +127,33 @@ build-installer: manifests generate kustomize ## Generate a consolidated YAML wi
 	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
 	$(KUSTOMIZE) build config/default > dist/install.yaml
 
+KIND_CLUSTER_NAME ?= kind
+
+.PHONY: kind-load
+kind-load: ## Loads the docker image into a local kind cluster.
+	kind load docker-image ${IMG} --name "$(KIND_CLUSTER_NAME)"
+
 ##@ Deployment
 
 ifndef ignore-not-found
   ignore-not-found = false
 endif
 
 .PHONY: install
-install: kubectl kustomize ## Install CRDs into the K8s cluster specified in ~/.kube/config.
+install: kubectl kustomize ## Install CRDs into the K8s cluster specified by $KUBECONFIG.
 	$(KUSTOMIZE) build config/crd | $(KUBECTL) apply -f -
 
 .PHONY: uninstall
-uninstall: kubectl kustomize ## Uninstall CRDs from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.
+uninstall: kubectl kustomize ## Uninstall CRDs from the K8s cluster specified by $KUBECONFIG. Call with ignore-not-found=true to ignore resource not found errors during deletion.
 	$(KUSTOMIZE) build config/crd | $(KUBECTL) delete --ignore-not-found=$(ignore-not-found) -f -
 
 .PHONY: deploy
-deploy: kubectl kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
+deploy: kubectl kustomize ## Deploy controller to the K8s cluster specified by $KUBECONFIG.
 	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
 	$(KUSTOMIZE) build config/default | $(KUBECTL) apply -f -
 
 .PHONY: undeploy
-undeploy: kubectl kustomize ## Undeploy controller from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.
+undeploy: kubectl kustomize ## Undeploy controller from the K8s cluster specified by $KUBECONFIG. Call with ignore-not-found=true to ignore resource not found errors during deletion.
 	$(KUSTOMIZE) build config/default | $(KUBECTL) delete --ignore-not-found=$(ignore-not-found) -f -
 
 ##@ Dependencies

config/manager/kustomization.yaml

@@ -5,3 +5,4 @@ resources:
 images:
 - name: controller
   newName: ghcr.io/kcp-dev/kcp-operator
+  newTag: e2e

config/manager/manager.yaml

@@ -50,19 +50,15 @@ spec:
       #               - linux
       securityContext:
         runAsNonRoot: true
-        # TODO(user): For common cases that do not require escalating privileges
-        # it is recommended to ensure that all your Pods/Containers are restrictive.
-        # More info: https://kubernetes.io/docs/concepts/security/pod-security-standards/#restricted
-        # Please uncomment the following code if your project does NOT have to work on old Kubernetes
-        # versions < 1.19 or on vendors versions which do NOT support this field by default (i.e. Openshift < 4.11 ).
-        # seccompProfile:
-        #   type: RuntimeDefault
+        seccompProfile:
+          type: RuntimeDefault
       containers:
       - command:
         - /manager
         args:
           - --leader-elect
           - --health-probe-bind-address=:8081
+          - --zap-time-encoding=iso8601
         image: controller:latest
         name: manager
         securityContext:

docs/content/contributing/local-setup.md

@@ -58,19 +58,20 @@ run the operator as a binary.
 Build the image:
 
 ```sh
-make docker-build IMG=ghcr.io/kcp-dev/kcp-operator:1
+export IMG=ghcr.io/kcp-dev/kcp-operator:local
+make docker-build
 ```
 
 Load the image into the kind cluster:
 
 ```sh
-kind load docker-image ghcr.io/kcp-dev/kcp-operator:1
+kind load docker-image "$IMG"
 ```
 
 Deploy the operator manifests into the cluster:
 
 ```sh
-make deploy IMG=ghcr.io/kcp-dev/kcp-operator:1
+make deploy
 ```
 
 ### Option 2: Run Operator Directly
@@ -87,12 +88,12 @@ Then start the operator via `go run`:
 go run ./cmd/main.go
 ```
 
-## Create kcp Instance 
+## Create kcp Instance
 
 Now you can create a root shard:
 
 ```sh
-kubectl apply -f config/samples/operator.kcp.io_v1alpha1_rootshard.yaml       
+kubectl apply -f config/samples/operator.kcp.io_v1alpha1_rootshard.yaml
 ```
 
 Create the additional shard:

hack/run-e2e-tests.sh

@@ -16,7 +16,7 @@
 
 set -euo pipefail
 
-KIND_CLUSTER_NAME="${KIND_CLUSTER_NAME:-e2e}"
+export KIND_CLUSTER_NAME="${KIND_CLUSTER_NAME:-e2e}"
 DATA_DIR=".e2e-$KIND_CLUSTER_NAME"
 OPERATOR_PID=0
 PROTOKOL_PID=0
@@ -35,12 +35,6 @@ kind create cluster --name "$KIND_CLUSTER_NAME"
 chmod 600 "$KUBECONFIG"
 
 teardown_kind() {
-  if [[ $OPERATOR_PID -gt 0 ]]; then
-    echo "Stopping kcp-operator…"
-    kill -TERM $OPERATOR_PID
-    wait $OPERATOR_PID
-  fi
-
   if [[ $PROTOKOL_PID -gt 0 ]]; then
     echo "Stopping protokol…"
     kill -TERM $PROTOKOL_PID
@@ -60,7 +54,7 @@ echo "Kubeconfig is in $KUBECONFIG."
 
 # deploying operator CRDs
 echo "Deploying operator CRDs…"
-kubectl apply --kustomize config/crd
+make --no-print-directory install
 
 # deploying cert-manager
 echo "Deploying cert-manager…"
@@ -79,16 +73,10 @@ _tools/helm upgrade \
 
 kubectl apply --filename hack/ci/testdata/clusterissuer.yaml
 
-# start the operator locally
-echo "Starting kcp-operator…"
-_build/manager \
-  -kubeconfig "$KUBECONFIG" \
-  -zap-log-level debug \
-  -zap-encoder console \
-  -zap-time-encoding iso8601 \
-  >"$DATA_DIR/kcp-operator.log" 2>&1 &
-OPERATOR_PID=$!
-echo "Running as process $OPERATOR_PID."
+# build operator image and deploy it into kind
+echo "Building and deploying kcp-operator…"
+export IMG="ghcr.io/kcp-dev/kcp-operator:e2e"
+make --no-print-directory docker-build kind-load deploy
 
 if command -v protokol &> /dev/null; then
   protokol --namespace 'e2e-*' --output "$DATA_DIR/kind-logs" 2>/dev/null &