WIP

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

Author: xrstf

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

@@ -80,8 +80,12 @@ func KubeconfigSecretReconciler(
 		}
 
 		serverURL := resources.GetShardBaseURL(shard)
+		defaultURL, err := url.JoinPath(serverURL, "clusters", "root")
+		if err != nil {
+			return nil, err
+		}
 
-		addCluster("default", serverURL)
+		addCluster("default", defaultURL)
 		addCluster("shard-base", serverURL)
 		config.CurrentContext = "default"
 

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,