Skip to content

Commit ed66747

Browse files
committed
feat: Create new entry
1 parent a6cb2c1 commit ed66747

File tree

4 files changed

+13
-6
lines changed

4 files changed

+13
-6
lines changed

jupyterhub/templates/_helpers-names.tpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,10 +198,10 @@
198198

199199
{{- /* hook-image-puller ServiceAccount */}}
200200
{{- define "jupyterhub.hook-image-puller-serviceaccount.fullname" -}}
201-
{{- if .Values.prePuller.hook.serviceAccount.create }}
202-
{{- .Values.prePuller.hook.serviceAccount.name | default (include "jupyterhub.hook-image-puller.fullname" .) }}
201+
{{- if .Values.prePuller.hook.serviceAccountImagePuller.create }}
202+
{{- .Values.prePuller.hook.serviceAccountImagePuller.name | default (include "jupyterhub.hook-image-puller.fullname" .) }}
203203
{{- else }}
204-
{{- .Values.prePuller.hook.serviceAccount.name | default "default" }}
204+
{{- .Values.prePuller.hook.serviceAccountImagePuller.name | default "default" }}
205205
{{- end }}
206206
{{- end }}
207207

jupyterhub/templates/image-puller/serviceaccount-hook.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{{- /*
2-
ServiceAccount for the hook image-puller
2+
ServiceAccount for the hook image-puller daemonset
33
*/}}
4-
{{- if .Values.prePuller.hook.serviceAccount.create -}}
4+
{{- if .Values.prePuller.hook.serviceAccountImagePuller.create -}}
55
{{- if (include "jupyterhub.imagePuller.daemonset.hook.install" .) -}}
66
apiVersion: v1
77
kind: ServiceAccount
@@ -14,7 +14,7 @@ metadata:
1414
"helm.sh/hook": pre-install,pre-upgrade
1515
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
1616
"helm.sh/hook-weight": "0"
17-
{{- with .Values.prePuller.hook.serviceAccount.annotations }}
17+
{{- with .Values.prePuller.hook.serviceAccountImagePuller.annotations }}
1818
{{- . | toYaml | nindent 4 }}
1919
{{- end }}
2020
{{- end }}

jupyterhub/values.schema.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2864,6 +2864,7 @@ properties:
28642864
image: *image-spec
28652865
resources: *resources-spec
28662866
serviceAccount: *serviceAccount
2867+
serviceAccountImagePuller: *serviceAccount
28672868
continuous:
28682869
type: object
28692870
additionalProperties: false

jupyterhub/values.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -665,10 +665,16 @@ prePuller:
665665
nodeSelector: {}
666666
tolerations: []
667667
resources: {}
668+
# Service Account for the hook-image-awaiter Job
668669
serviceAccount:
669670
create: true
670671
name:
671672
annotations: {}
673+
# Service Account for the hook-image-puller DaemonSet
674+
serviceAccountImagePuller:
675+
create: true
676+
name:
677+
annotations: {}
672678
continuous:
673679
enabled: true
674680
serviceAccount:

0 commit comments

Comments
 (0)