From ec18cc5102c668099850ae934bfe25f48a9be415 Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Thu, 17 Apr 2025 09:25:49 -0500 Subject: [PATCH] fix(argocd): remove finalizer that should by controlled by policy We should not be setting this finalizer on our Applications since it should be set there by the AppSet applicationsSync. See https://argo-cd.readthedocs.io/en/stable/operator-manual/applicationset/Controlling-Resource-Modification/ for more context. --- apps/appsets/appset-understack-infra.yaml | 3 +-- apps/appsets/appset-understack-operators.yaml | 3 +-- apps/appsets/components.yaml | 3 +-- apps/appsets/openstack.yaml | 3 +-- apps/appsets/understack.yaml | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/apps/appsets/appset-understack-infra.yaml b/apps/appsets/appset-understack-infra.yaml index c0c9c557b..0d9209321 100644 --- a/apps/appsets/appset-understack-infra.yaml +++ b/apps/appsets/appset-understack-infra.yaml @@ -81,8 +81,7 @@ spec: template: metadata: name: '{{.name}}-{{.component}}' - finalizers: - - resources-finalizer.argocd.argoproj.io + # 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: diff --git a/apps/appsets/appset-understack-operators.yaml b/apps/appsets/appset-understack-operators.yaml index 1ee35dee3..42864ff2b 100644 --- a/apps/appsets/appset-understack-operators.yaml +++ b/apps/appsets/appset-understack-operators.yaml @@ -139,8 +139,7 @@ spec: template: metadata: name: '{{.name}}-{{.component}}' - finalizers: - - resources-finalizer.argocd.argoproj.io + # 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: diff --git a/apps/appsets/components.yaml b/apps/appsets/components.yaml index d6efe0d44..b6790a710 100644 --- a/apps/appsets/components.yaml +++ b/apps/appsets/components.yaml @@ -232,8 +232,7 @@ spec: template: metadata: name: '{{.name}}-{{.component}}' - finalizers: - - resources-finalizer.argocd.argoproj.io + # 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: diff --git a/apps/appsets/openstack.yaml b/apps/appsets/openstack.yaml index a1bbc8b79..792706b1b 100644 --- a/apps/appsets/openstack.yaml +++ b/apps/appsets/openstack.yaml @@ -46,8 +46,7 @@ spec: template: metadata: name: '{{.name}}-{{.component}}' - finalizers: - - resources-finalizer.argocd.argoproj.io + # 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: diff --git a/apps/appsets/understack.yaml b/apps/appsets/understack.yaml index e84660daa..b7e88b702 100644 --- a/apps/appsets/understack.yaml +++ b/apps/appsets/understack.yaml @@ -828,8 +828,7 @@ spec: template: metadata: name: '{{.name}}-{{.component}}' - finalizers: - - resources-finalizer.argocd.argoproj.io + # we should never set the finalizer here as the applicationsSync policy will handle it spec: project: '{{coalesce (get . "componentProject") .component}}' destination: