Skip to content

Commit 82a260f

Browse files
committed
Let helper functions for image puller SA names be relevant or empty
1 parent 92ca679 commit 82a260f

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

jupyterhub/templates/_helpers-names.tpl

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

199199
{{- /* hook-image-puller ServiceAccount */}}
200200
{{- define "jupyterhub.hook-image-puller-serviceaccount.fullname" -}}
201-
{{- if .Values.prePuller.hook.serviceAccountImagePuller.create }}
202-
{{- .Values.prePuller.hook.serviceAccountImagePuller.name | default (include "jupyterhub.hook-image-puller.fullname" .) }}
203-
{{- else }}
204-
{{- .Values.prePuller.hook.serviceAccountImagePuller.name | default "default" }}
205-
{{- end }}
201+
{{- .Values.prePuller.hook.serviceAccountImagePuller.name | default (include "jupyterhub.hook-image-puller.fullname" .) }}
206202
{{- end }}
207203

208204
{{- /* continuous-image-puller DaemonSet */}}
@@ -212,11 +208,7 @@
212208

213209
{{- /* continuous-image-puller ServiceAccount */}}
214210
{{- define "jupyterhub.continuous-image-puller-serviceaccount.fullname" -}}
215-
{{- if .Values.prePuller.continuous.serviceAccount.create }}
216-
{{- .Values.prePuller.continuous.serviceAccount.name | default (include "jupyterhub.continuous-image-puller.fullname" .) }}
217-
{{- else }}
218-
{{- .Values.prePuller.continuous.serviceAccount.name | default "default" }}
219-
{{- end }}
211+
{{- .Values.prePuller.continuous.serviceAccount.name | default (include "jupyterhub.continuous-image-puller.fullname" .) }}
220212
{{- end }}
221213

222214
{{- /* singleuser NetworkPolicy */}}

0 commit comments

Comments
 (0)