Merge pull request #1242 from rackerlabs/update-argo-server-side

fix(argocd): disable ServerSideApply for OpenStack Helm Apps

Author: cardoe

apps/appsets/appset-understack-openstack.yaml

@@ -78,8 +78,6 @@ spec:
     metadata:
       name: '{{.name}}-{{.component}}'
       # we should never set the finalizer here as the applicationsSync policy will handle it
-      annotations:
-        argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true
     spec:
       project: understack
       sources:
@@ -121,9 +119,10 @@ spec:
           # sync should be run if a change is detected in the resource objects
           selfHeal: true
         syncOptions:
-          # Use the server side apply behavior of kubernetes for resources, we've got the
-          # compare option set above to support this.
-          - ServerSideApply=true
+          # We cannot use server side apply due to needing to use force=true on the
+          # OpenStack Helm jobs. ArgoCD has made force=true on hooks not compatible
+          # with server side apply.
+          - ServerSideApply=false
           # Resources might have mutated fields and we want to allow those to be set without
           # ArgoCD coming back and smacking them back. The ignoreDifferences templatePatch
           # uses this feature.