Merge pull request #1817 from consideRatio/pr/fix-prePuller-regression

prePuller: fix recently introduced regression
jupyterhub · Oct 7, 2020 · 5df3b12 · 5df3b12
2 parents 9c658da + bcc818c
commit 5df3b12
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/jupyterhub/templates/image-puller/_daemonset-helper.yaml b/jupyterhub/templates/image-puller/_daemonset-helper.yaml
@@ -90,7 +90,7 @@ spec:
             - -c
             - echo "Pulling complete"
           resources:
-            {{- .Values.prePuller.resources | toYaml | trimSuffix "\n" | nindent 12 }}
+            {{- $.Values.prePuller.resources | toYaml | trimSuffix "\n" | nindent 12 }}
         {{- end }}
         {{- end }}
         {{- end }}

diff --git a/tools/templates/lint-and-validate-values.yaml b/tools/templates/lint-and-validate-values.yaml
@@ -156,6 +156,16 @@ auth:
 
 
 singleuser:
+  profileList:
+    - display_name: "mock display name 1"
+      description: |
+        mock description 1
+      default: True
+    - display_name: "mock display name 2"
+      description: |
+        mock description 2
+      kubespawner_override:
+        image: XYZ:XYZ
   nodeSelector:
     mock-node-selector: mock
   extraTolerations: