feat(argocd-apps): finalizers for applicationset (#2952)

argoproj · Oct 1, 2024 · 994838a · 994838a
1 parent c38d299
commit 994838a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/charts/argocd-apps/Chart.yaml b/charts/argocd-apps/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: argocd-apps
 description: A Helm chart for managing additional Argo CD Applications and Projects
 type: application
-version: 2.0.1
+version: 2.0.2
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 keywords:
@@ -17,5 +17,5 @@ annotations:
     fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
     url: https://argoproj.github.io/argo-helm/pgp_keys.asc
   artifacthub.io/changes: |
-    - kind: fixed
-      description: not rendering empty app description
+    - kind: added
+      description: allow setting applicationset finalizers
diff --git a/charts/argocd-apps/ci/applicationsets-values.yaml b/charts/argocd-apps/ci/applicationsets-values.yaml
@@ -4,6 +4,8 @@ applicationsets:
   applicationset:
     additionalLabels: {}
     additionalAnnotations: {}
+    finalizers:
+    - resources-finalizer.argocd.argoproj.io
     # See PR #10026 (ArgoCD v2.5 or later)
     # goTemplate: false
     generators:

diff --git a/charts/argocd-apps/templates/applicationsets.yaml b/charts/argocd-apps/templates/applicationsets.yaml
@@ -17,6 +17,10 @@ metadata:
   {{- with $appSetData.namespace }}
   namespace: {{ . }}
   {{- end }}
+  {{- with $appSetData.finalizers }}
+  finalizers:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   {{- if hasKey $appSetData "goTemplate" }}
   goTemplate: {{ $appSetData.goTemplate }}

diff --git a/charts/argocd-apps/values.yaml b/charts/argocd-apps/values.yaml
@@ -97,6 +97,8 @@ applicationsets: {}
 #    namespace: argocd
 #    additionalLabels: {}
 #    additionalAnnotations: {}
+#    finalizers:
+#    - resources-finalizer.argocd.argoproj.io
 #    # See PR #10026 (ArgoCD v2.5 or later)
 #    # goTemplate: false
 #    generators: