diff --git a/internal/resources/api_server_certificate.go b/internal/resources/api_server_certificate.go index 37a7737..6df0215 100644 --- a/internal/resources/api_server_certificate.go +++ b/internal/resources/api_server_certificate.go @@ -117,6 +117,7 @@ func (r *APIServerCertificate) mutate(ctx context.Context, tenantControlPlane *k } r.resource.SetLabels(utilities.MergeMaps( + r.resource.GetLabels(), utilities.KamajiLabels(tenantControlPlane.GetName(), r.GetName()), map[string]string{ constants.ControllerLabelResource: utilities.CertificateX509Label, diff --git a/internal/resources/api_server_kubelet_client_certificate.go b/internal/resources/api_server_kubelet_client_certificate.go index 12d64a5..ccb828e 100644 --- a/internal/resources/api_server_kubelet_client_certificate.go +++ b/internal/resources/api_server_kubelet_client_certificate.go @@ -104,6 +104,7 @@ func (r *APIServerKubeletClientCertificate) mutate(ctx context.Context, tenantCo } r.resource.SetLabels(utilities.MergeMaps( + r.resource.GetLabels(), utilities.KamajiLabels(tenantControlPlane.GetName(), r.GetName()), map[string]string{ constants.ControllerLabelResource: utilities.CertificateX509Label, diff --git a/internal/resources/ca_certificate.go b/internal/resources/ca_certificate.go index 7d79e5a..c6891d9 100644 --- a/internal/resources/ca_certificate.go +++ b/internal/resources/ca_certificate.go @@ -153,7 +153,7 @@ func (r *CACertificate) mutate(ctx context.Context, tenantControlPlane *kamajiv1 corev1.TLSPrivateKeyKey: ca.PrivateKey, } - r.resource.SetLabels(utilities.KamajiLabels(tenantControlPlane.GetName(), r.GetName())) + r.resource.SetLabels(utilities.MergeMaps(r.resource.GetLabels(), utilities.KamajiLabels(tenantControlPlane.GetName(), r.GetName()))) utilities.SetObjectChecksum(r.resource, r.resource.Data) diff --git a/internal/resources/datastore/datastore_certificate.go b/internal/resources/datastore/datastore_certificate.go index ffae2ee..30a1e97 100644 --- a/internal/resources/datastore/datastore_certificate.go +++ b/internal/resources/datastore/datastore_certificate.go @@ -106,6 +106,7 @@ func (r *Certificate) mutate(ctx context.Context, tenantControlPlane *kamajiv1al r.resource.Data["ca.crt"] = ca r.resource.SetLabels(utilities.MergeMaps( + r.resource.GetLabels(), utilities.KamajiLabels(tenantControlPlane.GetName(), r.GetName()), map[string]string{ constants.ControllerLabelResource: utilities.CertificateX509Label, diff --git a/internal/resources/datastore/datastore_storage_config.go b/internal/resources/datastore/datastore_storage_config.go index 6e4f029..492a498 100644 --- a/internal/resources/datastore/datastore_storage_config.go +++ b/internal/resources/datastore/datastore_storage_config.go @@ -190,7 +190,7 @@ func (r *Config) mutate(ctx context.Context, tenantControlPlane *kamajiv1alpha1. utilities.SetObjectChecksum(r.resource, r.resource.Data) - r.resource.SetLabels(utilities.KamajiLabels(tenantControlPlane.GetName(), r.GetName())) + r.resource.SetLabels(utilities.MergeMaps(r.resource.GetLabels(), utilities.KamajiLabels(tenantControlPlane.GetName(), r.GetName()))) return ctrl.SetControllerReference(tenantControlPlane, r.resource, r.Client.Scheme()) } diff --git a/internal/resources/front-proxy-client-certificate.go b/internal/resources/front-proxy-client-certificate.go index 95e7826..a6876b6 100644 --- a/internal/resources/front-proxy-client-certificate.go +++ b/internal/resources/front-proxy-client-certificate.go @@ -104,6 +104,7 @@ func (r *FrontProxyClientCertificate) mutate(ctx context.Context, tenantControlP } r.resource.SetLabels(utilities.MergeMaps( + r.resource.GetLabels(), utilities.KamajiLabels(tenantControlPlane.GetName(), r.GetName()), map[string]string{ constants.ControllerLabelResource: utilities.CertificateX509Label, diff --git a/internal/resources/front_proxy_ca_certificate.go b/internal/resources/front_proxy_ca_certificate.go index d01d975..b79e949 100644 --- a/internal/resources/front_proxy_ca_certificate.go +++ b/internal/resources/front_proxy_ca_certificate.go @@ -126,7 +126,7 @@ func (r *FrontProxyCACertificate) mutate(ctx context.Context, tenantControlPlane kubeadmconstants.FrontProxyCAKeyName: ca.PrivateKey, } - r.resource.SetLabels(utilities.KamajiLabels(tenantControlPlane.GetName(), r.GetName())) + r.resource.SetLabels(utilities.MergeMaps(r.resource.GetLabels(), utilities.KamajiLabels(tenantControlPlane.GetName(), r.GetName()))) if isRotationRequested { utilities.SetLastRotationTimestamp(r.resource) diff --git a/internal/resources/k8s_ingress_resource.go b/internal/resources/k8s_ingress_resource.go index a008bfb..51610f8 100644 --- a/internal/resources/k8s_ingress_resource.go +++ b/internal/resources/k8s_ingress_resource.go @@ -151,7 +151,7 @@ func (r *KubernetesIngressResource) Define(_ context.Context, tenantControlPlane func (r *KubernetesIngressResource) mutate(tenantControlPlane *kamajiv1alpha1.TenantControlPlane) controllerutil.MutateFn { return func() error { - labels := utilities.MergeMaps(utilities.KamajiLabels(tenantControlPlane.GetName(), r.GetName()), tenantControlPlane.Spec.ControlPlane.Ingress.AdditionalMetadata.Labels) + labels := utilities.MergeMaps(r.resource.GetLabels(), utilities.KamajiLabels(tenantControlPlane.GetName(), r.GetName()), tenantControlPlane.Spec.ControlPlane.Ingress.AdditionalMetadata.Labels) r.resource.SetLabels(labels) annotations := utilities.MergeMaps(r.resource.GetAnnotations(), tenantControlPlane.Spec.ControlPlane.Ingress.AdditionalMetadata.Annotations) diff --git a/internal/resources/k8s_service_resource.go b/internal/resources/k8s_service_resource.go index 35d9931..35cad15 100644 --- a/internal/resources/k8s_service_resource.go +++ b/internal/resources/k8s_service_resource.go @@ -83,7 +83,12 @@ func (r *KubernetesServiceResource) mutate(ctx context.Context, tenantControlPla address, _ := tenantControlPlane.DeclaredControlPlaneAddress(ctx, r.Client) return func() error { - labels := utilities.MergeMaps(utilities.KamajiLabels(tenantControlPlane.GetName(), r.GetName()), tenantControlPlane.Spec.ControlPlane.Service.AdditionalMetadata.Labels) + labels := utilities.MergeMaps( + r.resource.GetLabels(), + utilities.KamajiLabels( + tenantControlPlane.GetName(), r.GetName()), + tenantControlPlane.Spec.ControlPlane.Service.AdditionalMetadata.Labels, + ) r.resource.SetLabels(labels) annotations := utilities.MergeMaps(r.resource.GetAnnotations(), tenantControlPlane.Spec.ControlPlane.Service.AdditionalMetadata.Annotations) diff --git a/internal/resources/kubeadm_config.go b/internal/resources/kubeadm_config.go index c3b4c6f..0ff7d6f 100644 --- a/internal/resources/kubeadm_config.go +++ b/internal/resources/kubeadm_config.go @@ -96,7 +96,7 @@ func (r *KubeadmConfigResource) mutate(ctx context.Context, tenantControlPlane * return err } - r.resource.SetLabels(utilities.KamajiLabels(tenantControlPlane.GetName(), r.GetName())) + r.resource.SetLabels(utilities.MergeMaps(r.resource.GetLabels(), utilities.KamajiLabels(tenantControlPlane.GetName(), r.GetName()))) params := kubeadm.Parameters{ TenantControlPlaneAddress: address, diff --git a/internal/resources/kubeconfig.go b/internal/resources/kubeconfig.go index 864d132..0a670c7 100644 --- a/internal/resources/kubeconfig.go +++ b/internal/resources/kubeconfig.go @@ -172,6 +172,7 @@ func (r *KubeconfigResource) mutate(ctx context.Context, tenantControlPlane *kam } r.resource.SetLabels(utilities.MergeMaps( + r.resource.GetLabels(), utilities.KamajiLabels(tenantControlPlane.GetName(), r.GetName()), map[string]string{ constants.ControllerLabelResource: utilities.CertificateKubeconfigLabel, diff --git a/internal/resources/sa_certificate.go b/internal/resources/sa_certificate.go index cd0cf9c..fe063fc 100644 --- a/internal/resources/sa_certificate.go +++ b/internal/resources/sa_certificate.go @@ -122,7 +122,7 @@ func (r *SACertificate) mutate(ctx context.Context, tenantControlPlane *kamajiv1 kubeadmconstants.ServiceAccountPrivateKeyName: sa.PrivateKey, } - r.resource.SetLabels(utilities.KamajiLabels(tenantControlPlane.GetName(), r.GetName())) + r.resource.SetLabels(utilities.MergeMaps(r.resource.GetLabels(), utilities.KamajiLabels(tenantControlPlane.GetName(), r.GetName()))) if isRotationRequested { utilities.SetLastRotationTimestamp(r.resource)