Merge pull request #1275 from consideRatio/fix-extraImages-lint

Fix prePuller.extraImages linting etc
jupyterhub · May 12, 2019 · 236fb48 · 236fb48
2 parents eaf87a2 + 142f743
commit 236fb48
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/doc/source/advanced.md b/doc/source/advanced.md
@@ -227,8 +227,8 @@ your `config.yaml`:
 
 ```yaml
 prePuller:
-   hook:
-     enabled: false
+  hook:
+    enabled: false
 ```
 
 ### Pre-pulling and changes in cluster size
@@ -264,10 +264,10 @@ of additional images.
 
 ```yaml
 prePuller:
-   extraImages:
-     ubuntu-xenial:
-       name: ubuntu
-       tag: 16.04
+  extraImages:
+    ubuntu-xenial:
+      name: ubuntu
+      tag: 16.04
 ```
 
 This snippet will pre-pull the `ubuntu:16.04` image on all nodes, for example. You can

diff --git a/doc/source/optimization.md b/doc/source/optimization.md
@@ -134,7 +134,7 @@ the following paths:
 - `singleuser.image`
 - `singleuser.profileList[].kubespawner_override.image`
 - `singleuser.extraContainers[].image`
-- `prePuller.extraImages[].someName`
+- `prePuller.extraImages.someName`
 
 #### Additional sources
 - `singleuser.networkTools.image`

diff --git a/tools/templates/lint-and-validate-values.yaml b/tools/templates/lint-and-validate-values.yaml
@@ -294,7 +294,11 @@ prePuller:
   continuous:
     enabled: true
   extraImages:
-    - name: mock-user/mock-image
+    mockImage1:
+      name: mock-user/mock-image1
+      tag: mock-tag
+    mockImage2:
+      name: mock-user/mock-image2
       tag: mock-tag