Added logic for annotations custom labels

Signed-off-by: Alka Kumari <alkumari@redhat.com>

Author: alkakumari016

controllers/argocd/applicationset.go

@@ -292,7 +292,6 @@ func (r *ReconcileArgoCD) reconcileApplicationSetDeployment(cr *argoproj.ArgoCD,
 			existing.Spec.Template.Spec.NodeSelector = deploy.Spec.Template.Spec.NodeSelector
 			existing.Spec.Template.Spec.Tolerations = deploy.Spec.Template.Spec.Tolerations
 			existing.Spec.Template.Spec.Containers[0].SecurityContext = deploy.Spec.Template.Spec.Containers[0].SecurityContext
-			existing.Spec.Template.Annotations = deploy.Spec.Template.Annotations
 
 			argoutil.LogResourceUpdate(log, existing, "due to difference in", deploymentsDifferent)
 			return r.Update(context.TODO(), existing)

controllers/argocd/deployment.go

@@ -1250,11 +1250,7 @@ func (r *ReconcileArgoCD) reconcileServerDeployment(cr *argoproj.ArgoCD, useTLSF
 		}
 
 		//Check if labels/annotations have changed
-		UpdateMapValues(&existing.Spec.Template.Labels, deploy.Spec.Template.Labels)
-		UpdateMapValues(&existing.Spec.Template.Annotations, deploy.Spec.Template.Annotations)
-
-		if !reflect.DeepEqual(deploy.Spec.Template.Annotations, existing.Spec.Template.Annotations) {
-			existing.Spec.Template.Annotations = deploy.Spec.Template.Annotations
+		if UpdateMapValues(&existing.Spec.Template.Annotations, deploy.Spec.Template.Annotations) {
 			if changed {
 				explanation += ", "
 			}

controllers/argocd/repo_server.go

@@ -513,12 +513,8 @@ func (r *ReconcileArgoCD) reconcileRepoDeployment(cr *argocdoperatorv1beta1.Argo
 			changed = true
 		}
 
-		// Add Kubernetes-specific labels/annotations from the live object in the source to preserve metadata.
-		UpdateMapValues(&existing.Spec.Template.Labels, deploy.Spec.Template.Labels)
-		UpdateMapValues(&existing.Spec.Template.Annotations, deploy.Spec.Template.Annotations)
-
-		if !reflect.DeepEqual(deploy.Spec.Template.Annotations, existing.Spec.Template.Annotations) {
-			existing.Spec.Template.Annotations = deploy.Spec.Template.Annotations
+		//Check if labels/annotations have changed
+		if UpdateMapValues(&existing.Spec.Template.Annotations, deploy.Spec.Template.Annotations) {
 			if changed {
 				explanation += ", "
 			}

controllers/argocd/statefulset.go

@@ -985,20 +985,15 @@ func (r *ReconcileArgoCD) reconcileApplicationControllerStatefulSet(cr *argoproj
 		}
 
 		//Check if labels/annotations have changed
-		UpdateMapValues(&existing.Spec.Template.Labels, ss.Spec.Template.Labels)
-		UpdateMapValues(&existing.Spec.Template.Annotations, ss.Spec.Template.Annotations)
-
-		if !reflect.DeepEqual(ss.Spec.Template.Annotations, existing.Spec.Template.Annotations) {
-			existing.Spec.Template.Annotations = ss.Spec.Template.Annotations
+		if UpdateMapValues(&existing.Spec.Template.Annotations, ss.Spec.Template.Annotations) {
 			if changed {
 				explanation += ", "
 			}
 			explanation += "annotations"
 			changed = true
 		}
 
-		if !reflect.DeepEqual(ss.Spec.Template.Labels, existing.Spec.Template.Labels) {
-			existing.Spec.Template.Labels = ss.Spec.Template.Labels
+		if UpdateMapValues(&existing.Spec.Template.Labels, ss.Spec.Template.Labels) {
 			if changed {
 				explanation += ", "
 			}