Merge pull request #2200 from consideRatio/pr/strict-schema

schema: catch typos in template values using JSONSchema's `additionalProperties`
jupyterhub · May 18, 2021 · bfbd50a · bfbd50a
2 parents 363f612 + 1f31321
commit bfbd50a
Show file tree

Hide file tree

Showing 9 changed files with 184 additions and 35 deletions.
diff --git a/.github/workflows/test-chart.yaml b/.github/workflows/test-chart.yaml
@@ -12,15 +12,13 @@ on:
       - "doc/**"
       - "**/test-docs.yaml"
       - "**.md"
-      - "**/schema.yaml"
       - ".github/workflows/*"
       - "!.github/workflows/test-chart.yaml"
   push:
     paths-ignore:
       - "doc/**"
       - "**/test-docs.yaml"
       - "**.md"
-      - "**/schema.yaml"
       - ".github/workflows/*"
       - "!.github/workflows/test-chart.yaml"
     branches-ignore:

diff --git a/jupyterhub/files/hub/jupyterhub_config.py b/jupyterhub/files/hub/jupyterhub_config.py
@@ -180,8 +180,8 @@ def camelCaseify(s):
 # Combine imagePullSecret.create (single), imagePullSecrets (list), and
 # singleuser.image.pullSecrets (list).
 image_pull_secrets = []
-if get_config("imagePullSecret.automaticReferenceInjection") and (
-    get_config("imagePullSecret.create") or get_config("imagePullSecret.enabled")
+if get_config("imagePullSecret.automaticReferenceInjection") and get_config(
+    "imagePullSecret.create"
 ):
     image_pull_secrets.append(get_name("image-pull-secret"))
 if get_config("imagePullSecrets"):