add make test-e2e-with-kind

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

Author: xrstf

.gitignore

@@ -27,3 +27,6 @@ go.work.sum
 # Downloaded and built binaries
 /_build/
 /_tools/
+
+# e2e test logs and artifacts
+/.e2e-*

Makefile

@@ -64,10 +64,15 @@ test: fmt vet ## Run tests.
 	go test $$(go list ./... | grep -v /e2e) -coverprofile cover.out
 
 # Utilize Kind or modify the e2e tests to load the image locally, enabling compatibility with other vendors.
-.PHONY: test-e2e  # Run the e2e tests against a Kind k8s instance that is spun up.
+.PHONY: test-e2e  # Run the e2e tests against a kind k8s instance that is already spun up.
 test-e2e:
 	go test ./test/e2e/ -v
 
+# Creates a kind cluster and runs the e2e tests in them. The kind cluster is destroyed after the tests.
+.PHONY: test-e2e-with-kind  # Run the e2e tests against a temporary kind cluster.
+test-e2e-with-kind:
+	@./hack/run-e2e-tests.sh
+
 .PHONY: lint
 lint: golangci-lint ## Run golangci-lint linter.
 	$(GOLANGCI_LINT) run --timeout 10m

hack/ci/run-e2e-tests.sh

@@ -98,6 +98,11 @@ helm upgrade \
 kubectl apply --filename hack/ci/testdata/clusterissuer.yaml
 
 echo "Running e2e tests…"
-(set -x; go test -tags e2e -timeout 2h -v ./test/e2e/...)
+
+WHAT="${WHAT:-./test/e2e/...}"
+TEST_ARGS="${TEST_ARGS:--timeout 2h -v}"
+E2E_PARALLELISM=${E2E_PARALLELISM:-2}
+
+(set -x; go test -tags e2e -p $E2E_PARALLELISM $TEST_ARGS "$WHAT")
 
 echo "Done. :-)"

hack/run-e2e-tests.sh

@@ -0,0 +1,84 @@
+#!/usr/bin/env bash
+
+# Copyright 2025 The KCP Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -euo pipefail
+
+KIND_CLUSTER_NAME="${KIND_CLUSTER_NAME:-e2e}"
+DATA_DIR=".e2e-$KIND_CLUSTER_NAME"
+OPERATOR_PID=0
+
+mkdir -p "$DATA_DIR"
+echo "Logs are stored in $DATA_DIR/."
+DATA_DIR="$(realpath "$DATA_DIR")"
+
+# create a local kind cluster
+
+export KUBECONFIG="$DATA_DIR/kind.kubeconfig"
+echo "Creating kind cluster $KIND_CLUSTER_NAME…"
+kind create cluster --name "$KIND_CLUSTER_NAME"
+chmod 600 "$KUBECONFIG"
+
+teardown_kind() {
+  echo "Stopping kcp-operator…"
+  kill -TERM $OPERATOR_PID
+  wait $OPERATOR_PID
+
+  kind delete cluster --name "$KIND_CLUSTER_NAME"
+  rm "$KUBECONFIG"
+}
+trap teardown_kind EXIT
+
+echo "Kubeconfig is in $KUBECONFIG."
+
+# deploying operator CRDs
+echo "Deploying operator CRDs…"
+kubectl apply --kustomize config/crd
+
+# deploying cert-manager
+echo "Deploying cert-manager…"
+
+helm repo add jetstack https://charts.jetstack.io --force-update
+helm repo update
+
+helm upgrade \
+  --install \
+  --namespace cert-manager \
+  --create-namespace \
+  --version v1.18.2 \
+  --set crds.enabled=true \
+  --atomic \
+  cert-manager jetstack/cert-manager
+
+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."
+
+echo "Running e2e tests…"
+
+WHAT="${WHAT:-./test/e2e/...}"
+TEST_ARGS="${TEST_ARGS:--timeout 2h -v}"
+E2E_PARALLELISM=${E2E_PARALLELISM:-2}
+
+(set -x; go test -tags e2e -p $E2E_PARALLELISM $TEST_ARGS "$WHAT")