CI: separate pebble/jh chart config

gtear · Jun 8, 2020 · 32838b3 · 32838b3
1 parent 310aa5e
commit 32838b3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -40,7 +40,7 @@ install:
   - helm repo update
 
   # Install a local ACME server
-  - helm install pebble jupyterhub/pebble --values dev-config.yaml
+  - helm install pebble jupyterhub/pebble --values dev-config-pebble.yaml
 
   # Build our images if needed and update values.yaml with the tags
   - chartpress

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -150,7 +150,7 @@ __Install Pebble__
 ```shell
 helm repo add jupyterhub https://jupyterhub.github.io/helm-chart/
 helm repo update
-helm install pebble jupyterhub/pebble --values dev-config.yaml
+helm install pebble jupyterhub/pebble --values dev-config-pebble.yaml
 ```
 
 ## 4: Build images, update values, install chart

diff --git a/dev-config-pebble.yaml b/dev-config-pebble.yaml
@@ -0,0 +1,7 @@
+# This configuration is meant to map lookups of local.jovyan.org to the
+# ClusterIP of JupyterHub's proxy-public service
+coredns:
+  corefileSegment: |-
+    template ANY ANY local.jovyan.org {
+      answer "{{ .Name }} 60 IN CNAME proxy-public.{$PEBBLE_NAMESPACE}.svc.cluster.local"
+    }
diff --git a/dev-config.yaml b/dev-config.yaml
@@ -75,11 +75,3 @@ prePuller:
 
 debug:
   enabled: true
-
-# A few values for the Pebble Helm chart, allowing us to fool Pebble to resolve
-# all .test domains to our proxy-public service.
-coredns:
-  corefileSegment: |-
-    template ANY ANY local.jovyan.org {
-      answer "{{ .Name }} 60 IN CNAME proxy-public.{$PEBBLE_NAMESPACE}.svc.cluster.local"
-    }