From b40081eec7f7a5cdf7ed7749bef36b0bd5f30c90 Mon Sep 17 00:00:00 2001 From: Jack Jackson Date: Wed, 21 Jun 2023 21:41:31 -0700 Subject: [PATCH] Add deletion finalizers --- app-of-apps/templates/apps.yaml | 82 ++++++++++++++++++--------------- main-manifest.yaml | 2 + 2 files changed, 48 insertions(+), 36 deletions(-) diff --git a/app-of-apps/templates/apps.yaml b/app-of-apps/templates/apps.yaml index ee9c2bc..067b8d5 100644 --- a/app-of-apps/templates/apps.yaml +++ b/app-of-apps/templates/apps.yaml @@ -3,6 +3,8 @@ kind: Application metadata: name: cert-manager namespace: argo + finalizers: + - resources-finalizer.argocd.argoproj.io spec: project: default @@ -30,6 +32,8 @@ kind: Application metadata: name: prom-crds namespace: argo + finalizers: + - resources-finalizer.argocd.argoproj.io spec: project: default @@ -57,6 +61,8 @@ kind: Application metadata: name: prometheus-community namespace: argo + finalizers: + - resources-finalizer.argocd.argoproj.io spec: project: default @@ -103,42 +109,44 @@ spec: prune: true syncOptions: - CreateNamespace=true -# --- -# apiVersion: argoproj.io/v1alpha1 -# kind: Application -# metadata: -# name: grafana -# namespace: argo -# spec: -# project: default - -# source: -# chart: grafana -# repoURL: https://grafana.github.io/helm-charts -# targetRevision: "6.49.0" - -# helm: -# parameters: -# - name: image.tag -# value: "9.3.2" -# - name: ingress.enabled -# value: "true" -# - name: ingress.hosts[0] -# value: grafana.avril -# - name: persistence.enabled -# value: "true" -# - name: persistence.storageClassName -# value: longhorn - -# destination: -# server: "https://kubernetes.default.svc" -# namespace: grafana - -# syncPolicy: -# automated: -# prune: true -# syncOptions: -# - CreateNamespace=true +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: grafana + namespace: argo + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: default + + source: + chart: grafana + repoURL: https://grafana.github.io/helm-charts + targetRevision: "6.49.0" + + helm: + parameters: + - name: image.tag + value: "9.3.2" + - name: ingress.enabled + value: "true" + - name: ingress.hosts[0] + value: grafana.avril + - name: persistence.enabled + value: "true" + - name: persistence.storageClassName + value: longhorn + + destination: + server: "https://kubernetes.default.svc" + namespace: grafana + + syncPolicy: + automated: + prune: true + syncOptions: + - CreateNamespace=true --- # TODO - use Jsonnet or similar to automate building this from all the directories # (and pull out the common config) @@ -147,6 +155,8 @@ kind: Application metadata: name: jellyfin namespace: argo + finalizers: + - resources-finalizer.argocd.argoproj.io spec: project: default diff --git a/main-manifest.yaml b/main-manifest.yaml index 8f8b057..b02828a 100644 --- a/main-manifest.yaml +++ b/main-manifest.yaml @@ -3,6 +3,8 @@ kind: Application metadata: name: jackjack-app-of-apps namespace: argo + finalizers: + - resources-finalizer.argocd.argoproj.io spec: project: default