Fix bug where ArgoCD removes nodePlacement stanza from configuration

Rizwana777 · Rizwana777 · commit 5b274ed5d491 · 2024-07-30T11:01:29.000+05:30
Signed-off-by: Rizwana777 &lt;rizwananaaz177@gmail.com&gt;
diff --git a/controllers/gitopsservice_controller.go b/controllers/gitopsservice_controller.go
@@ -472,9 +472,12 @@ 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
+		// if user is patching nodePlacement through GitopsService CR, then existingArgoCD NodePlacement is updated.
+		if defaultArgoCDInstance.Spec.NodePlacement != nil {
+			if !reflect.DeepEqual(existingArgoCD.Spec.NodePlacement, defaultArgoCDInstance.Spec.NodePlacement) {
+				existingArgoCD.Spec.NodePlacement = defaultArgoCDInstance.Spec.NodePlacement
+				changed = true
+			}
 		}
 
 		if changed {

Original file line number	Diff line number	Diff line change
`@@ -472,9 +472,12 @@ func (r ReconcileGitopsService) reconcileDefaultArgoCDInstance(instance pipeli`
`472`	`472`	`changed = true`
`473`	`473`	`}`
`474`	`474`
`475`		`- if !reflect.DeepEqual(existingArgoCD.Spec.NodePlacement, defaultArgoCDInstance.Spec.NodePlacement) {`
`476`		`- existingArgoCD.Spec.NodePlacement = defaultArgoCDInstance.Spec.NodePlacement`
`477`		`- changed = true`
	`475`	`+ // if user is patching nodePlacement through GitopsService CR, then existingArgoCD NodePlacement is updated.`
	`476`	`+ if defaultArgoCDInstance.Spec.NodePlacement != nil {`
	`477`	`+ if !reflect.DeepEqual(existingArgoCD.Spec.NodePlacement, defaultArgoCDInstance.Spec.NodePlacement) {`
	`478`	`+ existingArgoCD.Spec.NodePlacement = defaultArgoCDInstance.Spec.NodePlacement`
	`479`	`+ changed = true`
	`480`	`+ }`
`478`	`481`	`}`
`479`	`482`
`480`	`483`	`if changed {`