feat: Address review

Author: samyuh

jupyterhub/templates/_helpers-names.tpl

@@ -201,6 +201,15 @@
     {{- include "jupyterhub.fullname.dash" . }}continuous-image-puller
 {{- end }}
 
+{{- /* continuous-image-puller ServiceAccount */}}
+{{- define "jupyterhub.continuous-image-puller-serviceaccount.fullname" -}}
+    {{- if .Values.prePuller.continuous.serviceAccount.create }}
+        {{- .Values.prePuller.continuous.serviceAccount.name | default (include "jupyterhub.continuous-image-puller.fullname" .) }}
+    {{- else }}
+        {{- .Values.prePuller.continuous.serviceAccount.name | default "default" }}
+    {{- end }}
+{{- end }}
+
 {{- /* singleuser NetworkPolicy */}}
 {{- define "jupyterhub.singleuser.fullname" -}}
     {{- include "jupyterhub.fullname.dash" . }}singleuser

jupyterhub/templates/image-puller/_helpers-daemonset.tpl

@@ -71,9 +71,13 @@ spec:
       {{- end }}
       terminationGracePeriodSeconds: 0
       {{- if .hook }}
-      serviceAccountName: "hook-image-puller-serviceaccount"
+      {{- with include "jupyterhub.hook-image-awaiter-serviceaccount.fullname" . }}
+      serviceAccountName: {{ . }}
+      {{- end }}
       {{- else }}
-      serviceAccountName: "continuous-image-puller-serviceaccount"
+      {{- with include "jupyterhub.continuous-image-puller-serviceaccount.fullname" . }}
+      serviceAccountName: {{ . }}
+      {{- end }}
       {{- end }}
       automountServiceAccountToken: false
       {{- with include "jupyterhub.imagePullSecrets" (dict "root" . "image" .Values.singleuser.image) }}

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

@@ -1,5 +1,5 @@
 {{- /*
-ServiceAccount for the continuous hook's
+ServiceAccount for the continuous image-puller
 */}}
 {{- if .Values.prePuller.hook.serviceAccount.create -}}
 {{- if .Values.prePuller.continuous.enabled -}}
@@ -9,8 +9,5 @@ metadata:
   name: "continuous-image-puller-serviceaccount"
   labels:
     {{- include "jupyterhub.labels" . | nindent 4 }}
-  annotations:
-    "helm.sh/hook": pre-install,pre-upgrade
-    "helm.sh/hook-weight": "0"
 {{- end }}
 {{- end }}

jupyterhub/values.yaml

@@ -671,6 +671,10 @@ prePuller:
       annotations: {}
   continuous:
     enabled: true
+    serviceAccount: 
+      create: true
+      name:
+      annotations: {}
   pullProfileListImages: true
   extraImages: {}
   pause: