From c2741db39eb8fa5786556f73a06ab18afc97f4d3 Mon Sep 17 00:00:00 2001 From: Noam Gal Date: Wed, 17 Sep 2025 11:32:35 +0300 Subject: [PATCH 1/2] fix: service account for cleanup runtime resources (#726) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --------- Co-authored-by: Wítallo <15958770+witalloliveira@users.noreply.github.com> --- .../pre-uninstall/cleanup-resources.yaml | 7 ++--- .../delete-runtime-from-platform.yaml | 4 +-- .../templates/hooks/pre-uninstall/rbac.yaml | 27 ++++++++++--------- 3 files changed, 21 insertions(+), 17 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 a8e612fb..ecd385a8 100644 --- a/charts/gitops-runtime/templates/hooks/pre-uninstall/cleanup-resources.yaml +++ b/charts/gitops-runtime/templates/hooks/pre-uninstall/cleanup-resources.yaml @@ -3,13 +3,14 @@ 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-weight: "5" + helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation spec: backoffLimit: 3 template: spec: - serviceAccount: argocd-application-controller + serviceAccount: runtime-cleanup restartPolicy: Never containers: - name: cleanup-runtime-resources 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..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 @@ -8,8 +8,8 @@ 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-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 ef0807bdc094a2c8f45e97790d31c87000a13da6 Mon Sep 17 00:00:00 2001 From: Noam Gal Date: Wed, 17 Sep 2025 13:55:06 +0300 Subject: [PATCH 2/2] bump