Skip to content

fix(common): run hook Jobs under the app ServiceAccount #23

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

Open
AMontagu wants to merge 1 commit into
base: next
Choose a base branch
from
Open

fix(common): run hook Jobs under the app ServiceAccount #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion sky/common/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ apiVersion: v2
name: common
description: Common Helm chart for Kubernetes
type: application
version: 1.0.19
version: 1.0.20
appVersion: "v0.1.0"
1 change: 1 addition & 0 deletions sky/common/templates/jobs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ metadata:
spec:
template:
spec:
serviceAccountName: {{ include "common.fullname" $ }}
containers:
- name: {{ .name }}
{{- if and (.image).tag .image.repository }}
Expand Down
16 changes: 12 additions & 4 deletions sky/common/templates/serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,17 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ include "common.fullname" . }}
labels:
{{- include "common.labels" . | nindent 4 }}
{{- with .Values.serviceAccount.annotations }}
annotations:
# Created in PreSync (wave -3, before PreSync hook Jobs such as db-migrate /
# collectstatic at -1) so that on a fresh namespace the hook pods can run
# under this SA — which carries the workload's IRSA / EKS Pod Identity —
# instead of the credential-less `default` SA. hook-delete-policy is
# BeforeHookCreation; the identity is bound by SA name, so recreate is safe.
argocd.argoproj.io/hook: PreSync
argocd.argoproj.io/hook-delete-policy: BeforeHookCreation
argocd.argoproj.io/sync-wave: "-3"
{{- with .Values.serviceAccount.annotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- end }}
labels:
{{- include "common.labels" . | nindent 4 }}