From e6e8d3403b82675c4bd648dde09624dec433d15f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C3=ADtallo?= <15958770+witalloliveira@users.noreply.github.com> Date: Mon, 4 Aug 2025 21:32:55 -0300 Subject: [PATCH 1/3] fix: service account for cleanup runtime resources --- .../templates/hooks/pre-uninstall/cleanup-resources.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/gitops-runtime/templates/hooks/pre-uninstall/cleanup-resources.yaml b/charts/gitops-runtime/templates/hooks/pre-uninstall/cleanup-resources.yaml index a8e612fb..f737d86e 100644 --- a/charts/gitops-runtime/templates/hooks/pre-uninstall/cleanup-resources.yaml +++ b/charts/gitops-runtime/templates/hooks/pre-uninstall/cleanup-resources.yaml @@ -9,7 +9,7 @@ spec: backoffLimit: 3 template: spec: - serviceAccount: argocd-application-controller + serviceAccount: runtime-cleanup restartPolicy: Never containers: - name: cleanup-runtime-resources From 7f9976e6e1c467fb0b318c612e753aac82f3d5ce Mon Sep 17 00:00:00 2001 From: Noam Gal Date: Wed, 17 Sep 2025 10:34:23 +0300 Subject: [PATCH 2/3] fixed cleanup hook with helm hook-weight annotations --- .../pre-uninstall/cleanup-resources.yaml | 4 +-- .../delete-runtime-from-platform.yaml | 5 ++-- .../templates/hooks/pre-uninstall/rbac.yaml | 27 ++++++++++--------- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/charts/gitops-runtime/templates/hooks/pre-uninstall/cleanup-resources.yaml b/charts/gitops-runtime/templates/hooks/pre-uninstall/cleanup-resources.yaml index f737d86e..1c3fc279 100644 --- a/charts/gitops-runtime/templates/hooks/pre-uninstall/cleanup-resources.yaml +++ b/charts/gitops-runtime/templates/hooks/pre-uninstall/cleanup-resources.yaml @@ -3,8 +3,8 @@ kind: Job metadata: name: cleanup-runtime-resources annotations: - "helm.sh/hook": pre-delete - "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation + helm.sh/hook: pre-delete + helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation spec: backoffLimit: 3 template: diff --git a/charts/gitops-runtime/templates/hooks/pre-uninstall/delete-runtime-from-platform.yaml b/charts/gitops-runtime/templates/hooks/pre-uninstall/delete-runtime-from-platform.yaml index f669b104..0100b524 100644 --- a/charts/gitops-runtime/templates/hooks/pre-uninstall/delete-runtime-from-platform.yaml +++ b/charts/gitops-runtime/templates/hooks/pre-uninstall/delete-runtime-from-platform.yaml @@ -8,8 +8,9 @@ kind: Job metadata: name: delete-runtime-from-platform annotations: - "helm.sh/hook": pre-delete - "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation,hook-failed + helm.sh/hook: pre-delete + helm.sh/hook-weight: "5" + helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation,hook-failed spec: backoffLimit: 3 template: diff --git a/charts/gitops-runtime/templates/hooks/pre-uninstall/rbac.yaml b/charts/gitops-runtime/templates/hooks/pre-uninstall/rbac.yaml index 62a62301..fb63a752 100644 --- a/charts/gitops-runtime/templates/hooks/pre-uninstall/rbac.yaml +++ b/charts/gitops-runtime/templates/hooks/pre-uninstall/rbac.yaml @@ -1,10 +1,20 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + name: runtime-cleanup + annotations: + helm.sh/hook: pre-delete + helm.sh/hook-weight: "-10" + helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation,hook-failed +--- apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: name: runtime-cleanup annotations: - "helm.sh/hook": pre-delete - "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation,hook-failed + helm.sh/hook: pre-delete + helm.sh/hook-weight: "-10" + helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation,hook-failed rules: - apiGroups: - "*" @@ -18,8 +28,9 @@ kind: RoleBinding metadata: name: runtime-cleanup annotations: - "helm.sh/hook": pre-delete - "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation,hook-failed + helm.sh/hook: pre-delete + helm.sh/hook-weight: "-10" + helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation,hook-failed roleRef: apiGroup: "" kind: Role @@ -27,11 +38,3 @@ roleRef: subjects: - kind: ServiceAccount name: runtime-cleanup ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: runtime-cleanup - annotations: - "helm.sh/hook": pre-delete - "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation,hook-failed From 966d892cfee58b74d22258f208452eb95e1cbce0 Mon Sep 17 00:00:00 2001 From: Noam Gal Date: Wed, 17 Sep 2025 10:35:17 +0300 Subject: [PATCH 3/3] moved the annotation to the correct place --- .../templates/hooks/pre-uninstall/cleanup-resources.yaml | 1 + .../hooks/pre-uninstall/delete-runtime-from-platform.yaml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/gitops-runtime/templates/hooks/pre-uninstall/cleanup-resources.yaml b/charts/gitops-runtime/templates/hooks/pre-uninstall/cleanup-resources.yaml index 1c3fc279..ecd385a8 100644 --- a/charts/gitops-runtime/templates/hooks/pre-uninstall/cleanup-resources.yaml +++ b/charts/gitops-runtime/templates/hooks/pre-uninstall/cleanup-resources.yaml @@ -4,6 +4,7 @@ metadata: name: cleanup-runtime-resources annotations: helm.sh/hook: pre-delete + helm.sh/hook-weight: "5" helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation spec: backoffLimit: 3 diff --git a/charts/gitops-runtime/templates/hooks/pre-uninstall/delete-runtime-from-platform.yaml b/charts/gitops-runtime/templates/hooks/pre-uninstall/delete-runtime-from-platform.yaml index 0100b524..bdb55e11 100644 --- a/charts/gitops-runtime/templates/hooks/pre-uninstall/delete-runtime-from-platform.yaml +++ b/charts/gitops-runtime/templates/hooks/pre-uninstall/delete-runtime-from-platform.yaml @@ -9,7 +9,6 @@ metadata: name: delete-runtime-from-platform annotations: helm.sh/hook: pre-delete - helm.sh/hook-weight: "5" helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation,hook-failed spec: backoffLimit: 3