WIP

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

Author: xrstf

Dockerfile.tester

@@ -1,9 +1,13 @@
-FROM docker.io/golang:1.24
+FROM docker.io/golang:1.23.7
 
-RUN git clone --depth 1 https://github.com/kcp-dev/kcp /apps/kcp
-WORKDIR /apps/kcp
+ENV HTTEST_VERSION="0.3.4"
+RUN curl --fail -LO https://codeberg.org/xrstf/httest/releases/download/v${HTTEST_VERSION}/httest_${HTTEST_VERSION}_linux_$(dpkg --print-architecture).tar.gz && \
+    tar xzf httest_*.tar.gz && \
+    mv httest_*/httest /usr/local/bin
 
-RUN go build -v ./...
+WORKDIR /apps/kcp
+RUN git clone --depth 1 https://github.com/kcp-dev/kcp . && \
+    go build -v ./test/...
 
 ENV NO_GORUN=1
 

Makefile

@@ -10,6 +10,7 @@ KUSTOMIZE_VERSION ?= v5.4.3
 CONTROLLER_TOOLS_VERSION ?= v0.16.1
 ENVTEST_VERSION ?= release-0.19
 GOLANGCI_LINT_VERSION ?= 2.1.6
+PROTOKOL_VERSION ?= 0.7.2
 
 # Image URL to use all building/pushing image targets
 IMG ?= ghcr.io/kcp-dev/kcp-operator
@@ -151,6 +152,7 @@ KUBECTL ?= $(TOOLS_DIR)/kubectl
 KUSTOMIZE ?= $(TOOLS_DIR)/kustomize
 ENVTEST ?= $(TOOLS_DIR)/setup-envtest
 GOLANGCI_LINT = $(TOOLS_DIR)/golangci-lint
+PROTOKOL = $(TOOLS_DIR)/protokol
 RECONCILER_GEN := $(TOOLS_DIR)/reconciler-gen
 OPENSHIFT_GOIMPORTS := $(TOOLS_DIR)/openshift-goimports
 
@@ -182,6 +184,13 @@ golangci-lint: $(GOLANGCI_LINT) ## Download golangci-lint locally if necessary.
 $(GOLANGCI_LINT):
 	@hack/download-tool.sh https://github.com/golangci/golangci-lint/releases/download/v${GOLANGCI_LINT_VERSION}/golangci-lint-${GOLANGCI_LINT_VERSION}-$(shell go env GOOS)-$(shell go env GOARCH).tar.gz golangci-lint $(GOLANGCI_LINT_VERSION)
 
+.PHONY: protokol
+protokol: $(PROTOKOL) ## Download protokol locally if necessary.
+
+.PHONY: $(PROTOKOL)
+$(PROTOKOL):
+	@hack/download-tool.sh https://codeberg.org/xrstf/protokol/releases/download/v${PROTOKOL_VERSION}/protokol_${PROTOKOL_VERSION}_$(shell go env GOOS)_$(shell go env GOARCH).tar.gz protokol $(PROTOKOL_VERSION)
+
 .PHONY: reconciler-gen
 reconciler-gen: $(RECONCILER_GEN) ## Download reconciler-gen locally if necessary.
 

hack/ci/run-kcp-e2e-tests.sh

@@ -43,6 +43,10 @@ echo "Creating kind cluster $KIND_CLUSTER_NAME…"
 kind create cluster --name "$KIND_CLUSTER_NAME"
 chmod 600 "$KUBECONFIG"
 
+# store logs as artifacts
+make protokol
+_tools/protokol --output "$ARTIFACTS/logs" --namespace 'kcp-*' >/dev/null 2>&1 &
+
 # load the operator image into the kind cluster
 image="ghcr.io/kcp-dev/kcp-operator:$IMAGE_TAG"
 archive=operator.tar

internal/controller/kubeconfig_controller.go

@@ -72,9 +72,10 @@ func (r *KubeconfigReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		return ctrl.Result{}, err
 	}
 
+	rootShard := &operatorv1alpha1.RootShard{}
+	shard := &operatorv1alpha1.Shard{}
+
 	var (
-		rootShard        *operatorv1alpha1.RootShard
-		shard            *operatorv1alpha1.Shard
 		clientCertIssuer string
 		serverCA         string
 	)

internal/resources/kubeconfig/secret.go

@@ -71,7 +71,7 @@ func KubeconfigSecretReconciler(
 		}
 
 		addCluster("default", defaultURL)
-		addCluster("shard-base", serverURL)
+		addCluster("base", serverURL)
 		config.CurrentContext = "default"
 
 	case kubeconfig.Spec.Target.ShardRef != nil:
@@ -80,9 +80,13 @@ func KubeconfigSecretReconciler(
 		}
 
 		serverURL := resources.GetShardBaseURL(shard)
+		defaultURL, err := url.JoinPath(serverURL, "clusters", "root")
+		if err != nil {
+			return nil, err
+		}
 
-		addCluster("default", serverURL)
-		addCluster("shard-base", serverURL)
+		addCluster("default", defaultURL)
+		addCluster("base", serverURL)
 		config.CurrentContext = "default"
 
 	case kubeconfig.Spec.Target.FrontProxyRef != nil:

test/e2e/kcpe2e/kcp_test.go

@@ -143,6 +143,9 @@ func TestKcpTestSuite(t *testing.T) {
 		ObjectMeta: metav1.ObjectMeta{
 			Namespace:    namespace,
 			GenerateName: "kcp-e2e-",
+			Labels: map[string]string{
+				"test": "kcp-e2e",
+			},
 		},
 		Spec: corev1.PodSpec{
 			RestartPolicy: corev1.RestartPolicyNever,