diff --git a/jupyterhub/templates/image-puller/_helpers-daemonset.tpl b/jupyterhub/templates/image-puller/_helpers-daemonset.tpl index 3ced34c98b..b787136a2b 100644 --- a/jupyterhub/templates/image-puller/_helpers-daemonset.tpl +++ b/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 diff --git a/jupyterhub/values.schema.yaml b/jupyterhub/values.schema.yaml index aec53ac0ee..9721ef84ea 100644 --- a/jupyterhub/values.schema.yaml +++ b/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 diff --git a/tools/templates/lint-and-validate-values.yaml b/tools/templates/lint-and-validate-values.yaml index d580adc06c..80f45b470d 100644 --- a/tools/templates/lint-and-validate-values.yaml +++ b/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