Enhancement on EnsureLabels function (#2446)

* add debug logs

Signed-off-by: Allen Li <liyuchen223@gmail.com>

* update ensure labels and add additional checks

Signed-off-by: Allen Li <liyuchen223@gmail.com>

* add update permission to issuers

Signed-off-by: Allen Li <liyuchen223@gmail.com>

* revert test log and registry

Signed-off-by: Allen Li <liyuchen223@gmail.com>

* remove repeat checks

Signed-off-by: Allen Li <liyuchen223@gmail.com>

* skip if input resource is empty

Signed-off-by: Allen Li <liyuchen223@gmail.com>

---------

Signed-off-by: Allen Li <liyuchen223@gmail.com>

Author: qpdpQ

bundle/manifests/ibm-common-service-operator.clusterserviceversion.yaml

@@ -455,6 +455,7 @@ spec:
                 - get
                 - list
                 - watch
+                - update
             - apiGroups:
                 - apps
               resources:

config/ibm-common-service-operator.yaml

@@ -388,6 +388,7 @@ rules:
   - get
   - list
   - watch
+  - update
 - apiGroups:
   - apps
   resources:

config/rbac/role.yaml

@@ -114,6 +114,7 @@ rules:
   - get
   - list
   - watch
+  - update
 - apiGroups:
   - apps
   resources:

helm/templates/rbac.yaml

@@ -80,6 +80,7 @@ rules:
       - get
       - list
       - watch
+      - update
   - apiGroups: 
       - apps
     resources: 

internal/controller/bootstrap/init.go

@@ -59,6 +59,8 @@ import (
 	ssv1 "github.com/IBM/ibm-secretshare-operator/api/v1"
 	odlm "github.com/IBM/operand-deployment-lifecycle-manager/v4/api/v1alpha1"
 
+	"maps"
+
 	certmanagerv1 "github.com/ibm/ibm-cert-manager-operator/apis/cert-manager/v1"
 )
 
@@ -1941,9 +1943,7 @@ func (b *Bootstrap) UpdateResourceLabel(instance *apiv3.CommonService) error {
 	// get spec.labels in the spec
 	for _, cs := range csObjectList.Items {
 		labels := cs.Spec.Labels
-		for key, val := range labels {
-			(labelsMap)[key] = val
-		}
+		maps.Copy(labelsMap, labels)
 	}
 
 	if len(labelsMap) == 0 {
@@ -1961,15 +1961,15 @@ func (b *Bootstrap) UpdateResourceLabel(instance *apiv3.CommonService) error {
 	}
 
 	// update labels in the configmap
-	cmNames := []string{"common-services-maps", "namespace-scope"}
+	nsscmName := "namespace-scope"
 	cmList := &corev1.ConfigMapList{}
-	for _, cmName := range cmNames {
-		cm := &corev1.ConfigMap{}
-		if err := b.Client.Get(context.TODO(), types.NamespacedName{Name: cmName, Namespace: b.CSData.ServicesNs}, cm); err != nil && !errors.IsNotFound(err) {
-			return err
-		} else if errors.IsNotFound(err) {
-			klog.V(3).Infof("configmap %s is not found in namespace: %s", cmName, b.CSData.ServicesNs)
-		}
+
+	cm := &corev1.ConfigMap{}
+	if err := b.Client.Get(context.TODO(), types.NamespacedName{Name: nsscmName, Namespace: b.CSData.OperatorNs}, cm); err != nil && !errors.IsNotFound(err) {
+		return err
+	} else if errors.IsNotFound(err) {
+		klog.V(3).Infof("configmap %s is not found in namespace: %s", nsscmName, b.CSData.OperatorNs)
+	} else {
 		cmList.Items = append(cmList.Items, *cm)
 	}
 	cmUnstructedList, err := util.ObjectListToNewUnstructuredList(cmList)
@@ -2002,8 +2002,9 @@ func (b *Bootstrap) UpdateResourceLabel(instance *apiv3.CommonService) error {
 		return err
 	} else if errors.IsNotFound(err) {
 		klog.V(3).Infof("OperandRegistry common-service is not found in namespace: %s", b.CSData.ServicesNs)
+	} else {
+		opregList.Items = append(opregList.Items, *opreg)
 	}
-	opregList.Items = append(opregList.Items, *opreg)
 	opregUnstructedList, err := util.ObjectListToNewUnstructuredList(opregList)
 	if err != nil {
 		return err
@@ -2021,8 +2022,9 @@ func (b *Bootstrap) UpdateResourceLabel(instance *apiv3.CommonService) error {
 			return err
 		} else if errors.IsNotFound(err) {
 			klog.V(3).Infof("Issuer %s is not found in namespace: %s", issuerName, b.CSData.ServicesNs)
+		} else {
+			issuerList.Items = append(issuerList.Items, *issuer)
 		}
-		issuerList.Items = append(issuerList.Items, *issuer)
 	}
 	issuerUnstructedList, err := util.ObjectListToNewUnstructuredList(issuerList)
 	if err != nil {
@@ -2040,8 +2042,9 @@ func (b *Bootstrap) UpdateResourceLabel(instance *apiv3.CommonService) error {
 		return err
 	} else if errors.IsNotFound(err) {
 		klog.V(3).Infof("certificate cs-ca-certificate is not found in namespace: %s", b.CSData.ServicesNs)
+	} else {
+		certList.Items = append(certList.Items, *cert)
 	}
-	certList.Items = append(certList.Items, *cert)
 	certUnstructedList, err := util.ObjectListToNewUnstructuredList(certList)
 	if err != nil {
 		return err
@@ -2055,6 +2058,9 @@ func (b *Bootstrap) UpdateResourceLabel(instance *apiv3.CommonService) error {
 
 func (b *Bootstrap) UpdateResourceWithLabel(resources *unstructured.UnstructuredList, labels map[string]string) error {
 	for _, resource := range resources.Items {
+		if resource.GetName() == "" {
+			continue
+		}
 		util.EnsureLabels(&resource, labels)
 		klog.Infof("Updating labels in %s %s/%s", resource.GetKind(), resource.GetNamespace(), resource.GetName())
 		if err := b.UpdateObject(&resource); err != nil {

internal/controller/common/util.go

@@ -47,6 +47,8 @@ import (
 	"k8s.io/klog"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	"maps"
+
 	apiv3 "github.com/IBM/ibm-common-service-operator/v4/api/v3"
 	"github.com/IBM/ibm-common-service-operator/v4/internal/controller/constant"
 	nssv1 "github.com/IBM/ibm-namespace-scope-operator/v4/api/v1"
@@ -687,12 +689,13 @@ func EnsureLabelsForConfigMap(cm *corev1.ConfigMap, labels map[string]string) {
 
 // EnsureLabels ensures that the specifc resource has the certain labels
 func EnsureLabels(resource *unstructured.Unstructured, labels map[string]string) {
-	if resource.Object["metadata"].(map[string]interface{})["labels"] == nil {
-		resource.Object["metadata"].(map[string]interface{})["labels"] = make(map[string]string)
-	}
-	for k, v := range labels {
-		resource.Object["metadata"].(map[string]interface{})["labels"].(map[string]string)[k] = v
+	if resource.GetLabels() == nil {
+		resource.SetLabels(labels)
+		return
 	}
+	newLabels := resource.GetLabels()
+	maps.Copy(newLabels, labels)
+	resource.SetLabels(newLabels)
 }
 
 // GetRequestNs gets requested-from-namespace of map-to-common-service-namespace