chart: fix pink daemonset image handling

The schema already defined everything needed to manage the image pull policy as well as pull secrets. No need to reinvent the wheel here.
jupyterhub · Sep 16, 2022 · 2c958a0 · 2c958a0
1 parent 23a4b7a
commit 2c958a0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/helm-chart/binderhub/schema.yaml b/helm-chart/binderhub/schema.yaml
@@ -424,10 +424,6 @@ properties:
         additionalProperties: false
         properties:
           image: *image-spec
-          imagePullSecrets:
-            type: array
-            description: |
-              Image pull secrets to download images for private images
           lifecycle: *lifecycle-spec
           extraVolumes: *extraVolumes-spec
           extraVolumeMounts: *extraVolumeMounts-spec

diff --git a/helm-chart/binderhub/templates/pink/daemonset.yaml b/helm-chart/binderhub/templates/pink/daemonset.yaml
@@ -32,7 +32,7 @@ spec:
       initContainers:
         {{- . | toYaml | nindent 8 }}
       {{- end }}
-      {{- with .Values.pink.imagePullSecrets }}
+      {{- with .Values.pink.daemonset.image.pullSecrets }}
       imagePullSecrets:
         {{- . | toYaml | nindent 8 }}
       {{- end }}
@@ -42,7 +42,7 @@ spec:
       containers:
       - name: pink
         image: {{ .Values.pink.daemonset.image.name }}:{{ .Values.pink.daemonset.image.tag }}
-        imagePullPolicy: {{ .Values.pink.daemonset.imagePullPolicy }}
+        imagePullPolicy: {{ .Values.pink.daemonset.image.pullPolicy }}
 
         resources:
           {{- .Values.pink.resources | toYaml | nindent 10 }}

diff --git a/helm-chart/binderhub/values.yaml b/helm-chart/binderhub/values.yaml
@@ -265,8 +265,6 @@ pink:
     image:
       name: quay.io/jupyterhub/repo2podman
       tag: latest
-    imagePullPolicy: IfNotPresent
-    imagePullSecrets: []
     lifecycle: {}
     extraVolumes: []
     extraVolumeMounts: []