updated controller logic to detect nil maps

Signed-off-by: Disaiah Bennett <[email protected]>
stolostron · Sep 26, 2023 · a598f43 · a598f43
1 parent 02d90c1
commit a598f43
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/controllers/backplaneconfig_controller.go b/controllers/backplaneconfig_controller.go
@@ -846,6 +846,10 @@ func (r *MultiClusterEngineReconciler) ensureOpenShiftNamespaceLabel(ctx context
 		return ctrl.Result{Requeue: true}, err
 	}
 
+	if existingNs.Labels == nil || len(existingNs.Labels) == 0 {
+		existingNs.Labels = make(map[string]string)
+	}
+
 	if _, ok := existingNs.Labels[utils.OpenShiftClusterMonitoringLabel]; !ok {
 		log.Info(fmt.Sprintf("Adding label: %s to namespace: %s", utils.OpenShiftClusterMonitoringLabel,
 			backplaneConfig.Spec.TargetNamespace))

diff --git a/controllers/backplaneconfig_controller_test.go b/controllers/backplaneconfig_controller_test.go
@@ -127,8 +127,7 @@ var _ = Describe("BackplaneConfig controller", func() {
 		// Create target namespace
 		err = k8sClient.Create(context.Background(), &corev1.Namespace{
 			ObjectMeta: metav1.ObjectMeta{
-				Name:   DestinationNamespace,
-				Labels: make(map[string]string),
+				Name: DestinationNamespace,
 			},
 			Spec: corev1.NamespaceSpec{},
 		})