Merge pull request #627 from mohtork/fix/preserve-argocd-spec-fields-on-update

fix: preserve existing ArgoCD spec fields during update

Author: mbaldessari

internal/controller/argo.go

@@ -480,6 +480,20 @@ func createOrUpdateArgoCD(client dynamic.Interface, fullClient kubernetes.Interf
 		}
 		newArgo := &unstructured.Unstructured{Object: obj}
 
+		// Preserve spec fields not known to this vendored argocd-operator version
+		// (e.g. networkPolicy added in gitops-operator v1.20.3) to avoid
+		// stripping them and causing infinite reconciliation loops.
+		oldUnstructured, errGet2 := client.Resource(gvr).Namespace(namespace).Get(context.TODO(), name, metav1.GetOptions{})
+		if errGet2 == nil {
+			oldSpec, _, _ := unstructured.NestedMap(oldUnstructured.Object, "spec")
+			newSpec, _, _ := unstructured.NestedMap(newArgo.Object, "spec")
+			for key, val := range oldSpec {
+				if _, exists := newSpec[key]; !exists {
+					_ = unstructured.SetNestedField(newArgo.Object, val, "spec", key)
+				}
+			}
+		}
+
 		_, err = client.Resource(gvr).Namespace(namespace).Update(context.TODO(), newArgo, metav1.UpdateOptions{})
 	}
 	return err

internal/controller/argo_test.go

@@ -1020,6 +1020,53 @@ var _ = Describe("CreateOrUpdateArgoCD", func() {
 		})
 	})
 
+    Context("when the ArgoCD instance exists with additional spec fields not managed by patterns-operator", func() {
+    BeforeEach(func() {
+        argoCD := &unstructured.Unstructured{
+            Object: map[string]any{
+                "apiVersion": "argoproj.io/v1beta1",
+                "kind":       "ArgoCD",
+                "metadata": map[string]any{
+                    "name":            name,
+                    "namespace":       namespace,
+                    "resourceVersion": "1",
+                },
+                "spec": map[string]any{
+                    "networkPolicy": map[string]any{
+                        "enabled": true,
+                    },
+                    "imageUpdater": map[string]any{
+                        "enabled": false,
+                    },
+                },
+            },
+        }
+        _, err := dynamicClient.Resource(gvr).Namespace(namespace).Create(context.TODO(), argoCD, metav1.CreateOptions{})
+        Expect(err).ToNot(HaveOccurred())
+    })
+
+    It("should preserve spec fields not managed by patterns-operator during update", func() {
+        err := createOrUpdateArgoCD(dynamicClient, nil, name, namespace, patternsOperatorConfig)
+        Expect(err).ToNot(HaveOccurred())
+
+        argoCD, err := dynamicClient.Resource(gvr).Namespace(namespace).Get(context.TODO(), name, metav1.GetOptions{})
+        Expect(err).ToNot(HaveOccurred())
+
+        // networkPolicy should be preserved — it is managed by gitops-operator
+        // not by patterns-operator, so the update must not strip it
+        networkPolicy, found, err := unstructured.NestedMap(argoCD.Object, "spec", "networkPolicy")
+        Expect(err).ToNot(HaveOccurred())
+        Expect(found).To(BeTrue(), "networkPolicy should be preserved after update")
+        Expect(networkPolicy["enabled"]).To(BeTrue())
+
+        // imageUpdater should also be preserved
+        imageUpdater, found, err := unstructured.NestedMap(argoCD.Object, "spec", "imageUpdater")
+        Expect(err).ToNot(HaveOccurred())
+        Expect(found).To(BeTrue(), "imageUpdater should be preserved after update")
+        Expect(imageUpdater["enabled"]).To(BeFalse())
+    })
+})
+
 	Context("when there is an error in the getArgoCD fn but there is an argocd", func() {
 
 		BeforeEach(func() {