feat: Update prepuller

Author: samyuh

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

@@ -70,8 +70,10 @@ spec:
               {{- include "jupyterhub.userNodeAffinityRequired" . | nindent 14 }}
       {{- end }}
       terminationGracePeriodSeconds: 0
-      {{- with include "jupyterhub.hook-image-awaiter-serviceaccount.fullname" . }}
-      serviceAccountName: {{ . }}
+      {{- if .hook }}
+      serviceAccountName: "hook-image-puller-serviceaccount"
+      {{- else }}
+      serviceAccountName: "continuous-image-puller-serviceaccount"
       {{- end }}
       automountServiceAccountToken: false
       {{- with include "jupyterhub.imagePullSecrets" (dict "root" . "image" .Values.singleuser.image) }}

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

@@ -0,0 +1,20 @@
+{{- /*
+ServiceAccount for the continuous hook's
+*/}}
+{{- if .Values.prePuller.hook.serviceAccount.create -}}
+{{- if .Values.prePuller.continuous.enabled -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: "continuous-image-puller-serviceaccount"
+  labels:
+    {{- include "jupyterhub.labels" . | nindent 4 }}
+    hub.jupyter.org/deletable: "true"
+  annotations:
+    "helm.sh/hook": pre-install,pre-upgrade
+    "helm.sh/hook-weight": "0"
+    {{- with .Values.prePuller.hook.serviceAccount.annotations }}
+    {{- . | toYaml | nindent 4 }}
+    {{- end }}
+{{- end }}
+{{- end }}

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

@@ -0,0 +1,21 @@
+{{- /*
+ServiceAccount for the pre-puller hook's
+*/}}
+{{- if .Values.prePuller.hook.serviceAccount.create -}}
+{{- if (include "jupyterhub.imagePuller.daemonset.hook.install" .) -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: "hook-image-puller-serviceaccount"
+  labels:
+    {{- include "jupyterhub.labels" . | nindent 4 }}
+    hub.jupyter.org/deletable: "true"
+  annotations:
+    "helm.sh/hook": pre-install,pre-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+    "helm.sh/hook-weight": "0"
+    {{- with .Values.prePuller.hook.serviceAccount.annotations }}
+    {{- . | toYaml | nindent 4 }}
+    {{- end }}
+{{- end }}
+{{- end }}

jupyterhub/templates/image-puller/serviceaccount.yaml

@@ -1,17 +1,19 @@
 {{- /*
-Service Account for the pre-puller hook
+ServiceAccount for the pre-puller hook's image-awaiter-job
 */}}
 {{- if .Values.prePuller.hook.serviceAccount.create -}}
-{{- if or (include "jupyterhub.imagePuller.daemonset.hook.install" .) .Values.prePuller.continuous.enabled -}}
+{{- if (include "jupyterhub.imagePuller.daemonset.hook.install" .) -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "jupyterhub.hook-image-awaiter-serviceaccount.fullname" . }}
   labels:
     {{- include "jupyterhub.labels" . | nindent 4 }}
+    hub.jupyter.org/deletable: "true"
   annotations:
     "helm.sh/hook": pre-install,pre-upgrade
-    "helm.sh/hook-weight": "-30"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+    "helm.sh/hook-weight": "0"
     {{- with .Values.prePuller.hook.serviceAccount.annotations }}
     {{- . | toYaml | nindent 4 }}
     {{- end }}