Copy annotation also into TenantControlPlane resource

Signed-off-by: Andrei Kvapil <[email protected]>

Author: kvaps

controllers/kamajicontrolplane_controller_resources.go

@@ -22,6 +22,8 @@ import (
 
 var ErrEnqueueBack = errors.New("enqueue back")
 
+const kubecofigSecretKeyAnnotation = "kamaji.clastix.io/kubeconfig-secret-key"
+
 //+kubebuilder:rbac:groups="",resources="secrets",verbs=get;list;watch;create;update;patch
 
 func (r *KamajiControlPlaneReconciler) createRequiredResources(ctx context.Context, cluster capiv1beta1.Cluster, kcp v1alpha1.KamajiControlPlane, tcp *kamajiv1alpha1.TenantControlPlane) (ctrl.Result, error) {
@@ -148,7 +150,7 @@ func (r *KamajiControlPlaneReconciler) createOrUpdateKubeconfig(ctx context.Cont
 			labels["kamaji.clastix.io/tcp"] = tcp.Name
 
 			secretKey := "admin.conf"
-			v, ok := kcp.GetAnnotations()["kamaji.clastix.io/kubeconfig-secret-key"]
+			v, ok := kcp.GetAnnotations()[kubecofigSecretKeyAnnotation]
 			if ok && v != "" {
 				secretKey = v
 			}

controllers/kamajicontrolplane_controller_tcp.go

@@ -23,6 +23,14 @@ func (r *KamajiControlPlaneReconciler) createOrUpdateTenantControlPlane(ctx cont
 	tcp := &kamajiv1alpha1.TenantControlPlane{}
 	tcp.Name = kcp.GetName()
 	tcp.Namespace = kcp.GetNamespace()
+	if tcp.Annotations == nil {
+		tcp.Annotations = make(map[string]string)
+	}
+	if kubeconfigSecretKey := kcp.Annotations[kubecofigSecretKeyAnnotation]; kubeconfigSecretKey != "" {
+		tcp.Annotations[kubecofigSecretKeyAnnotation] = kubeconfigSecretKey
+	} else {
+		delete(tcp.Annotations, kubecofigSecretKeyAnnotation)
+	}
 
 	err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
 		_, scopeErr := controllerutil.CreateOrUpdate(ctx, r.client, tcp, func() error {