From 3cf4a71b4b1d1d0448f0873442fc45b27edc376d Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Tue, 11 Feb 2025 22:11:41 -0600 Subject: [PATCH] fix: finish working around ArgoCD ServerSideApply In e22cccdba9c3557 we made the change only for OpenStack components but this brings it to the rest. See: https://argo-cd.readthedocs.io/en/stable/user-guide/diff-strategies/ https://github.com/argoproj/argo-cd/issues/11143 --- apps/appsets/components.yaml | 4 ++++ apps/appsets/infra.yaml | 2 ++ apps/appsets/operators.yaml | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/apps/appsets/components.yaml b/apps/appsets/components.yaml index 453918238..47fc1bc2b 100644 --- a/apps/appsets/components.yaml +++ b/apps/appsets/components.yaml @@ -222,6 +222,10 @@ spec: template: metadata: name: '{{.name}}-{{.component}}' + finalizers: + - resources-finalizer.argocd.argoproj.io + annotations: + argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true spec: project: default destination: diff --git a/apps/appsets/infra.yaml b/apps/appsets/infra.yaml index df12970b4..1fc9af33b 100644 --- a/apps/appsets/infra.yaml +++ b/apps/appsets/infra.yaml @@ -109,6 +109,8 @@ spec: name: '{{.name}}-{{.component}}' finalizers: - resources-finalizer.argocd.argoproj.io + annotations: + argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true spec: project: default destination: diff --git a/apps/appsets/operators.yaml b/apps/appsets/operators.yaml index a3ab99c3e..9a402acb0 100644 --- a/apps/appsets/operators.yaml +++ b/apps/appsets/operators.yaml @@ -99,6 +99,10 @@ spec: template: metadata: name: '{{.name}}-{{.component}}' + finalizers: + - resources-finalizer.argocd.argoproj.io + annotations: + argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true spec: project: operators destination: