Add additional contexts to kubeconfigs

On-behalf-of: SAP <[email protected]>
Signed-off-by: Marvin Beckers <[email protected]>

Author: embik

internal/controller/kubeconfig_controller.go

@@ -27,6 +27,7 @@ import (
 	k8creconciling "k8c.io/reconciler/pkg/reconciling"
 
 	corev1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -69,6 +70,10 @@ func (r *KubeconfigReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 
 	var kc operatorv1alpha1.Kubeconfig
 	if err := r.Get(ctx, req.NamespacedName, &kc); err != nil {
+		// object has been deleted.
+		if apierrors.IsNotFound(err) {
+			return ctrl.Result{}, nil
+		}
 		return ctrl.Result{}, err
 	}
 

internal/resources/kubeconfig/secret.go

@@ -47,13 +47,15 @@ func KubeconfigSecretReconciler(
 		},
 	}
 
-	addCluster := func(name, url string) {
-		config.Clusters[name] = &clientcmdapi.Cluster{
+	addCluster := func(clusterName, url string) {
+		config.Clusters[clusterName] = &clientcmdapi.Cluster{
 			Server:                   url,
 			CertificateAuthorityData: caSecret.Data["tls.crt"],
 		}
-		config.Contexts[name] = &clientcmdapi.Context{
-			Cluster:  name,
+	}
+	addContext := func(contextName, clusterName string) {
+		config.Contexts[contextName] = &clientcmdapi.Context{
+			Cluster:  clusterName,
 			AuthInfo: kubeconfig.Spec.Username,
 		}
 	}
@@ -71,7 +73,10 @@ func KubeconfigSecretReconciler(
 		}
 
 		addCluster("default", defaultURL)
+		addContext("default", "default")
 		addCluster("base", serverURL)
+		addContext("base", "base")
+		addContext("shard-base", "base")
 		config.CurrentContext = "default"
 
 	case kubeconfig.Spec.Target.ShardRef != nil:
@@ -86,7 +91,10 @@ func KubeconfigSecretReconciler(
 		}
 
 		addCluster("default", defaultURL)
+		addContext("default", "default")
 		addCluster("base", serverURL)
+		addContext("base", "base")
+		addContext("shard-base", "base")
 		config.CurrentContext = "default"
 
 	case kubeconfig.Spec.Target.FrontProxyRef != nil:
@@ -100,7 +108,10 @@ func KubeconfigSecretReconciler(
 			return nil, err
 		}
 
+		addCluster("base", serverURL)
 		addCluster("default", defaultURL)
+		addContext("default", "default")
+		addContext("base", "base")
 		config.CurrentContext = "default"
 
 	default: