Skip to content

Commit 328a83c

Browse files
fix: service account for cleanup runtime resources (#726)
--------- Co-authored-by: Wítallo <[email protected]>
1 parent becd2a9 commit 328a83c

File tree

3 files changed

+21
-17
lines changed

3 files changed

+21
-17
lines changed

charts/gitops-runtime/templates/hooks/pre-uninstall/cleanup-resources.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ kind: Job
33
metadata:
44
name: cleanup-runtime-resources
55
annotations:
6-
"helm.sh/hook": pre-delete
7-
"helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation
6+
helm.sh/hook: pre-delete
7+
helm.sh/hook-weight: "5"
8+
helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation
89
spec:
910
backoffLimit: 3
1011
template:
1112
spec:
12-
serviceAccount: argocd-application-controller
13+
serviceAccount: runtime-cleanup
1314
restartPolicy: Never
1415
containers:
1516
- name: cleanup-runtime-resources

charts/gitops-runtime/templates/hooks/pre-uninstall/delete-runtime-from-platform.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ kind: Job
88
metadata:
99
name: delete-runtime-from-platform
1010
annotations:
11-
"helm.sh/hook": pre-delete
12-
"helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation,hook-failed
11+
helm.sh/hook: pre-delete
12+
helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation,hook-failed
1313
spec:
1414
backoffLimit: 3
1515
template:

charts/gitops-runtime/templates/hooks/pre-uninstall/rbac.yaml

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,20 @@
1+
apiVersion: v1
2+
kind: ServiceAccount
3+
metadata:
4+
name: runtime-cleanup
5+
annotations:
6+
helm.sh/hook: pre-delete
7+
helm.sh/hook-weight: "-10"
8+
helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation,hook-failed
9+
---
110
apiVersion: rbac.authorization.k8s.io/v1
211
kind: Role
312
metadata:
413
name: runtime-cleanup
514
annotations:
6-
"helm.sh/hook": pre-delete
7-
"helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation,hook-failed
15+
helm.sh/hook: pre-delete
16+
helm.sh/hook-weight: "-10"
17+
helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation,hook-failed
818
rules:
919
- apiGroups:
1020
- "*"
@@ -18,20 +28,13 @@ kind: RoleBinding
1828
metadata:
1929
name: runtime-cleanup
2030
annotations:
21-
"helm.sh/hook": pre-delete
22-
"helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation,hook-failed
31+
helm.sh/hook: pre-delete
32+
helm.sh/hook-weight: "-10"
33+
helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation,hook-failed
2334
roleRef:
2435
apiGroup: ""
2536
kind: Role
2637
name: runtime-cleanup
2738
subjects:
2839
- kind: ServiceAccount
2940
name: runtime-cleanup
30-
---
31-
apiVersion: v1
32-
kind: ServiceAccount
33-
metadata:
34-
name: runtime-cleanup
35-
annotations:
36-
"helm.sh/hook": pre-delete
37-
"helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation,hook-failed

0 commit comments

Comments
 (0)