Fix bug where ArgoCD removes nodePlacement stanza from configuration

Signed-off-by: Rizwana777 <[email protected]>

Author: Rizwana777

controllers/gitopsservice_controller.go

@@ -472,9 +472,15 @@ func (r *ReconcileGitopsService) reconcileDefaultArgoCDInstance(instance *pipeli
 			changed = true
 		}
 
-		if !reflect.DeepEqual(existingArgoCD.Spec.NodePlacement, defaultArgoCDInstance.Spec.NodePlacement) {
-			existingArgoCD.Spec.NodePlacement = defaultArgoCDInstance.Spec.NodePlacement
-			changed = true
+		// Checking if default nodePlacement is nil to verify whether the patch is done using GitopService CR or ArgoCD CR
+		// if user is patching nodePlacement through GitopsService CR, then the above written logic for GitopsService will add custom values to defaultArgoCDInstance's nodePlacement,
+		// if user is patching nodePlacement through ArgoCD CR, defaultArgoCDInstance's nodePlacement will be nil and it will
+		// enter the if condition below and update the existing nodePlacement as nil which is a bug.
+		if defaultArgoCDInstance.Spec.NodePlacement != nil {
+			if !reflect.DeepEqual(existingArgoCD.Spec.NodePlacement, defaultArgoCDInstance.Spec.NodePlacement) {
+				existingArgoCD.Spec.NodePlacement = defaultArgoCDInstance.Spec.NodePlacement
+				changed = true
+			}
 		}
 
 		if changed {