feat(argocd-understack): clean up App resources when the App is removed

cardoe · cardoe · commit 4572cf7d349f · 2026-02-18T16:25:44.000-06:00
We need to use the finalizer to ensure that the resources are cleaned up
when the App is removed.
diff --git a/charts/argocd-understack/templates/application-argo-events-workflows.yaml.tpl b/charts/argocd-understack/templates/application-argo-events-workflows.yaml.tpl
@@ -4,6 +4,8 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: {{ printf "%s-%s" $.Release.Name "argo-events-workflows" }}
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
   annotations:
     argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true
 spec:
diff --git a/charts/argocd-understack/templates/application-argo-events.yaml.tpl b/charts/argocd-understack/templates/application-argo-events.yaml.tpl
@@ -3,6 +3,8 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: {{ printf "%s-%s" $.Release.Name "argo-events" }}
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
   annotations:
     argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true
 spec:
diff --git a/charts/argocd-understack/templates/application-argo-workflows.yaml.tpl b/charts/argocd-understack/templates/application-argo-workflows.yaml.tpl
@@ -4,6 +4,8 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: {{ printf "%s-%s" $.Release.Name "argo" }}
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
   annotations:
     argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true
 spec:
diff --git a/charts/argocd-understack/templates/application-cert-manager.yaml.tpl b/charts/argocd-understack/templates/application-cert-manager.yaml.tpl
@@ -4,6 +4,8 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: {{ printf "%s-%s" $.Release.Name "cert-manager" }}
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
   annotations:
     argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true
 spec:
diff --git a/charts/argocd-understack/templates/application-chrony.yaml.tpl b/charts/argocd-understack/templates/application-chrony.yaml.tpl
@@ -4,6 +4,8 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: {{ printf "%s-%s" $.Release.Name "chrony" }}
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
   annotations:
     argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true
 spec:
diff --git a/charts/argocd-understack/templates/application-cilium.yaml.tpl b/charts/argocd-understack/templates/application-cilium.yaml.tpl
@@ -4,6 +4,8 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: {{ printf "%s-%s" $.Release.Name "cilium" }}
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
   annotations:
     argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true
 spec:
diff --git a/charts/argocd-understack/templates/application-cnpg-system.yaml.tpl b/charts/argocd-understack/templates/application-cnpg-system.yaml.tpl
@@ -4,6 +4,8 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: {{ printf "%s-%s" $.Release.Name "cnpg-system" }}
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
   annotations:
     argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true
 spec:
diff --git a/charts/argocd-understack/templates/application-dex.yaml.tpl b/charts/argocd-understack/templates/application-dex.yaml.tpl
@@ -4,6 +4,8 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: {{ printf "%s-%s" $.Release.Name "dex" }}
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
   annotations:
     argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true
 spec:
diff --git a/charts/argocd-understack/templates/application-envoy-configs.yaml.tpl b/charts/argocd-understack/templates/application-envoy-configs.yaml.tpl
@@ -4,6 +4,8 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: {{ printf "%s-%s" $.Release.Name "envoy-configs" }}
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
   annotations:
     argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true
 spec:
diff --git a/charts/argocd-understack/templates/application-envoy-gateway.yaml.tpl b/charts/argocd-understack/templates/application-envoy-gateway.yaml.tpl
@@ -4,6 +4,8 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: {{ printf "%s-%s" $.Release.Name "envoy-gateway" }}
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
   annotations:
     argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true
 spec:
diff --git a/charts/argocd-understack/templates/application-etcdbackup.yaml.tpl b/charts/argocd-understack/templates/application-etcdbackup.yaml.tpl
@@ -4,6 +4,8 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: {{ printf "%s-%s" $.Release.Name "etcdbackup" }}
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
   annotations:
     argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true
 spec:
diff --git a/charts/argocd-understack/templates/application-external-dns.yaml.tpl b/charts/argocd-understack/templates/application-external-dns.yaml.tpl
@@ -4,6 +4,8 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: {{ printf "%s-%s" $.Release.Name "external-dns" }}
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
   annotations:
     argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true
 spec:
diff --git a/charts/argocd-understack/templates/application-external-secrets.yaml.tpl b/charts/argocd-understack/templates/application-external-secrets.yaml.tpl
@@ -4,6 +4,8 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: {{ printf "%s-%s" $.Release.Name "external-secrets" }}
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
   annotations:
     argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true
 spec:
diff --git a/charts/argocd-understack/templates/application-global-workflows.yaml.tpl b/charts/argocd-understack/templates/application-global-workflows.yaml.tpl
@@ -4,6 +4,8 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: {{ printf "%s-%s" $.Release.Name "global-workflows" }}
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
   annotations:
     argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true
 spec:
diff --git a/charts/argocd-understack/templates/application-ingress-nginx.yaml.tpl b/charts/argocd-understack/templates/application-ingress-nginx.yaml.tpl
@@ -4,6 +4,8 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: {{ printf "%s-%s" $.Release.Name "ingress-nginx" }}
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
   annotations:
     argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true
 spec:
diff --git a/charts/argocd-understack/templates/application-mariadb-operator.yaml.tpl b/charts/argocd-understack/templates/application-mariadb-operator.yaml.tpl
@@ -4,6 +4,8 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: {{ printf "%s-%s" $.Release.Name "mariadb-operator" }}
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
   annotations:
     argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true
 spec:
diff --git a/charts/argocd-understack/templates/application-nautobot-site.yaml.tpl b/charts/argocd-understack/templates/application-nautobot-site.yaml.tpl
@@ -4,6 +4,8 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: {{ printf "%s-%s" $.Release.Name "nautobot-site" }}
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
   annotations:
     argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true
 spec:
diff --git a/charts/argocd-understack/templates/application-nautobot.yaml.tpl b/charts/argocd-understack/templates/application-nautobot.yaml.tpl
@@ -4,6 +4,8 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: {{ printf "%s-%s" $.Release.Name "nautobot" }}
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
   annotations:
     argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true
 spec:
diff --git a/charts/argocd-understack/templates/application-nautobotop.yaml.tpl b/charts/argocd-understack/templates/application-nautobotop.yaml.tpl
@@ -4,6 +4,8 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: {{ printf "%s-%s" $.Release.Name "nautobotop" }}
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
   annotations:
     argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true
 spec:
diff --git a/charts/argocd-understack/templates/application-openebs.yaml.tpl b/charts/argocd-understack/templates/application-openebs.yaml.tpl
@@ -4,6 +4,8 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: {{ printf "%s-%s" $.Release.Name "openebs" }}
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
   annotations:
     argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true
 spec:
diff --git a/charts/argocd-understack/templates/application-openstack-exporter.yaml.tpl b/charts/argocd-understack/templates/application-openstack-exporter.yaml.tpl
@@ -4,6 +4,8 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: {{ printf "%s-%s" $.Release.Name "openstack-exporter" }}
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
   annotations:
     argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true
 spec:
diff --git a/charts/argocd-understack/templates/application-openstack-helm.yaml.tpl b/charts/argocd-understack/templates/application-openstack-helm.yaml.tpl
@@ -17,6 +17,8 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: {{ printf "%s-%s" $.Release.Name $appName }}
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
   {{/*
   {{- with $app.wave }}
   annotations:
diff --git a/charts/argocd-understack/templates/application-openstack-memcached.yaml.tpl b/charts/argocd-understack/templates/application-openstack-memcached.yaml.tpl
@@ -4,6 +4,8 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: {{ printf "%s-%s" $.Release.Name "openstack-memcached" }}
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
   annotations:
     argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true
 spec:
diff --git a/charts/argocd-understack/templates/application-openstack-resource-controller.yaml.tpl b/charts/argocd-understack/templates/application-openstack-resource-controller.yaml.tpl
@@ -4,6 +4,8 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: {{ printf "%s-%s" $.Release.Name "openstack-resource-controller" }}
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
   annotations:
     argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true
 spec:
diff --git a/charts/argocd-understack/templates/application-openstack.yaml.tpl b/charts/argocd-understack/templates/application-openstack.yaml.tpl
@@ -4,6 +4,8 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: {{ printf "%s-%s" $.Release.Name "openstack" }}
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
   annotations:
     argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true
   {{/*
diff --git a/charts/argocd-understack/templates/application-opentelemetry-operator.yaml.tpl b/charts/argocd-understack/templates/application-opentelemetry-operator.yaml.tpl
@@ -4,6 +4,8 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: {{ printf "%s-%s" $.Release.Name "opentelemetry-operator" }}
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
   annotations:
     argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true
 spec:
diff --git a/charts/argocd-understack/templates/application-openvswitch.yaml.tpl b/charts/argocd-understack/templates/application-openvswitch.yaml.tpl
@@ -5,6 +5,8 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: {{ printf "%s-%s" $.Release.Name "openvswitch" }}
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
 spec:
   destination:
     namespace: {{ $.Values.site.openstack.namespace }}
diff --git a/charts/argocd-understack/templates/application-otel-collector.yaml.tpl b/charts/argocd-understack/templates/application-otel-collector.yaml.tpl
@@ -4,6 +4,8 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: {{ printf "%s-%s" $.Release.Name "otel-collector" }}
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
   annotations:
     argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true
 spec:
diff --git a/charts/argocd-understack/templates/application-ovn.yaml.tpl b/charts/argocd-understack/templates/application-ovn.yaml.tpl
@@ -5,6 +5,8 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: {{ printf "%s-%s" $.Release.Name "ovn" }}
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
 spec:
   destination:
     namespace: {{ $.Values.site.openstack.namespace }}
diff --git a/charts/argocd-understack/templates/application-rabbitmq-system.yaml.tpl b/charts/argocd-understack/templates/application-rabbitmq-system.yaml.tpl
@@ -4,6 +4,8 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: {{ printf "%s-%s" $.Release.Name "rabbitmq-system" }}
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
   annotations:
     argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true
 spec:
diff --git a/charts/argocd-understack/templates/application-rook.yaml.tpl b/charts/argocd-understack/templates/application-rook.yaml.tpl
@@ -4,6 +4,8 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: {{ printf "%s-%s" $.Release.Name "rook" }}
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
   annotations:
     argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true
 spec:
diff --git a/charts/argocd-understack/templates/application-sealed-secrets.yaml.tpl b/charts/argocd-understack/templates/application-sealed-secrets.yaml.tpl
@@ -4,6 +4,8 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: {{ printf "%s-%s" $.Release.Name "sealed-secrets" }}
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
   annotations:
     argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true
 spec:
diff --git a/charts/argocd-understack/templates/application-site-workflows.yaml.tpl b/charts/argocd-understack/templates/application-site-workflows.yaml.tpl
@@ -4,6 +4,8 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: {{ printf "%s-%s" $.Release.Name "site-workflows" }}
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
   annotations:
     argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true
 spec:
diff --git a/charts/argocd-understack/templates/application-snmp-exporter.yaml.tpl b/charts/argocd-understack/templates/application-snmp-exporter.yaml.tpl
@@ -4,6 +4,8 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: {{ printf "%s-%s" $.Release.Name "snmp-exporter" }}
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
   annotations:
     argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true
 spec:
diff --git a/charts/argocd-understack/templates/application-understack-cluster-issuer.yaml.tpl b/charts/argocd-understack/templates/application-understack-cluster-issuer.yaml.tpl
@@ -4,6 +4,8 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: {{ printf "%s-%s" $.Release.Name "understack-cluster-issuer" }}
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
   annotations:
     argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true
 spec:
diff --git a/charts/argocd-understack/templates/application-undersync.yaml.tpl b/charts/argocd-understack/templates/application-undersync.yaml.tpl
@@ -4,6 +4,8 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: {{ printf "%s-%s" $.Release.Name "undersync" }}
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
   annotations:
     argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true
 spec:
