Merge pull request #3621 from manics/extraImagesPullPolicy

Add pullPolicy to pre-pulled extraImages

Author: consideRatio

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

@@ -196,6 +196,9 @@ spec:
         {{- range $k, $v := .Values.prePuller.extraImages }}
         - name: image-pull-{{ $k }}
           image: {{ $v.name }}:{{ $v.tag }}
+          {{- with $v.pullPolicy }}
+          imagePullPolicy: {{ . }}
+          {{- end }}
           command:
             - /bin/sh
             - -c

jupyterhub/values.schema.yaml

@@ -563,7 +563,7 @@ properties:
               v1.11.1
               zhy270a
               ```
-          pullPolicy:
+          pullPolicy: &imagePullPolicy
             enum: [null, "", IfNotPresent, Always, Never]
             description: |
               Configures the Pod's `spec.imagePullPolicy`.
@@ -2921,6 +2921,7 @@ properties:
                 type: string
               tag:
                 type: string
+              pullPolicy: *imagePullPolicy
       containerSecurityContext: *containerSecurityContext-spec
       pause:
         type: object

tools/templates/lint-and-validate-values.yaml

@@ -574,6 +574,7 @@ prePuller:
     mockImage2:
       name: mock-user/mock-image2
       tag: mock-tag
+      pullPolicy: Always
 
 ingress:
   enabled: true