Skip to content

Fix/svc-acc-pre-uninstall-hook #728

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 17, 2025
Merged

Fix/svc-acc-pre-uninstall-hook #728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2741db
fix: service account for cleanup runtime resources (#726)
ATGardner Sep 17, 2025
ef0807b
bump
ATGardner Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions charts/gitops-runtime/templates/hooks/pre-uninstall/cleanup-resources.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions charts/gitops-runtime/templates/hooks/pre-uninstall/delete-runtime-from-platform.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
27 changes: 15 additions & 12 deletions charts/gitops-runtime/templates/hooks/pre-uninstall/rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
- "*"
Expand All @@ -18,20 +28,13 @@ 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
name: runtime-cleanup
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