Merge pull request jupyterhub#1175 from consideRatio/restructure-for-dx

Restructure for DX (Developer Experience)

.circleci/config.yml

@@ -1,3 +1,6 @@
+# This CircleCI build lets us preview the documentation inside PRs before they 
+# are merged! And when they are, the readthedocs.yml file will help ReadTheDocs
+# build and publish it on https://z2jh.jupyter.org.
 version: 2
 jobs:
   build_docs:

.travis.yml

@@ -1,17 +1,17 @@
 dist: xenial
 language: python
 python:
-- 3.6
+  - 3.6
 git:
   depth: false
 services:
-- docker
+  - docker
 install:
-- pip3 install --no-cache-dir -r dev-requirements.txt
-- . "ci/minikube-${SCENARIO}.env"
-- ./ci/install.sh
+  - pip3 install --no-cache-dir -r dev-requirements.txt
+  - . "ci/minikube-${SCENARIO}.env"
+  - ./ci/install.sh
 script:
-- ./ci/travis-script.sh
+  - ./ci/travis-script.sh
 
 env:
   # Different scenarios described in
@@ -21,5 +21,5 @@ env:
     - SCENARIO=1.12-netpol
     - SCENARIO=1.11-default
   global:
-  - secure: jpFpbMccpjGP+otWH2Z03VFdtR9AAu2vzrNxsoZ3IvJvrO4MfzYJ3uSCDQuB0NG9gBgaAscpTJtliPTEi7njXHLcsFeWXLUmeBEHLozYxfzDQzMvW3EYdNWcC7oVAAt3de0i0ojw9rGswiofhbu2dAe+Xd2bejv1+PVJcEC3SRPGy17kb6bme6gD3zty5ft4VpzP0nomUNqfZBRLUYxSZuKlHJaZ6Nuq434rKmXrcN6uy+eEWDorTbjyM22IIYgUmrhg++Qtu/MBR7/rriPhyRltCU14361bcxqyq2Hw+HNG8D3hsqo5TiEiYwxOQcXRgddL+Ci6/y0L1EvqOQc+1V8ycwNs2oNicwNgSn5A+9HpF495Kae039hGtj2Gpt4IbplSYwKFq/sFTq+CekxdD2YVQmGvsjep4bNVL66o2RSZVAW1Bg/G8/sSe3BwgD8IToy9+1NHPPuaVupeukRqNyUDcVvWH8hdb8AkXYY87+546etYDpn91GQnhTEberKbXX4UCmpKNXpXoprLE8nQLGb6TIoHPTyA+RRNQ4erDzMjqF43UVmhOZTtkGaRgIWK7vDAKpLUnuOguuhJUNpYpRggGQsMV8cZnaCumy5OFUf6i6rfN0Ru6a+/Bm7grJiAcnZlU7igaxgI38QaJgCKcqqzIImdcRYNQC74/Ok/1oM=
-  - secure: BK++GwKVPoS0iG8aB7wQ13daTgJR9MifHA+l9xr/tSZ3SUL6nc7kjxLbliRQJCqT9lcOODsd+v2u9PziEzBp0CCh67ftFxJw8riP2+FgdmHTK4yav9QpSwoBJHhV2SgBMGlXiqdUVC7wpgjzzK63V8abvzAhXkthWPl3kYpUI//xGYyuBNXVHEOImHB3F1M5bn90lflFtRfq2iH5FigGesMi2BFfTVeqvbzZVZrAs0E1/NRdO+/cRq0c9aRpNLkh254k1tcKbUvULQq1iLQuHN2Ramn3NgNnx93sbwp1e7ZjmETbjr9cwMIDg5mh25H0Rjf2Nn8cqHbBCWzoMkjZW097HRVDYht2kJZQIbQcaxX38DW6vykUwGWSBAWbtvCUwYwU57s/dIbSYUTQErkYYmhiq52cdOtnxZ2/ULoElCVyR8lTmQuANJrq9YFC9q1ly69YuMWWnFgwxWpK1JCgAJGELgj5EvcghEtNmkEFh5f6pmbKBE7PKQPTovzNKcdRauR/L+MsmhVYukCfNZq57LrruIQIX1GQNw9w3Ck8P4EPtNjdI4umCSy6nZSyTevWgVTmIP9EwXa5Cap32ZU+iDtw+wUBAr3sjROJOYGKlL/ktWsWbjog5hIG0rrb8PbgOfbLRZSEYGL9sYsyXXyW5oI37lB7AqG6D7vOA4TdmTQ=
+    - secure: jpFpbMccpjGP+otWH2Z03VFdtR9AAu2vzrNxsoZ3IvJvrO4MfzYJ3uSCDQuB0NG9gBgaAscpTJtliPTEi7njXHLcsFeWXLUmeBEHLozYxfzDQzMvW3EYdNWcC7oVAAt3de0i0ojw9rGswiofhbu2dAe+Xd2bejv1+PVJcEC3SRPGy17kb6bme6gD3zty5ft4VpzP0nomUNqfZBRLUYxSZuKlHJaZ6Nuq434rKmXrcN6uy+eEWDorTbjyM22IIYgUmrhg++Qtu/MBR7/rriPhyRltCU14361bcxqyq2Hw+HNG8D3hsqo5TiEiYwxOQcXRgddL+Ci6/y0L1EvqOQc+1V8ycwNs2oNicwNgSn5A+9HpF495Kae039hGtj2Gpt4IbplSYwKFq/sFTq+CekxdD2YVQmGvsjep4bNVL66o2RSZVAW1Bg/G8/sSe3BwgD8IToy9+1NHPPuaVupeukRqNyUDcVvWH8hdb8AkXYY87+546etYDpn91GQnhTEberKbXX4UCmpKNXpXoprLE8nQLGb6TIoHPTyA+RRNQ4erDzMjqF43UVmhOZTtkGaRgIWK7vDAKpLUnuOguuhJUNpYpRggGQsMV8cZnaCumy5OFUf6i6rfN0Ru6a+/Bm7grJiAcnZlU7igaxgI38QaJgCKcqqzIImdcRYNQC74/Ok/1oM=
+    - secure: BK++GwKVPoS0iG8aB7wQ13daTgJR9MifHA+l9xr/tSZ3SUL6nc7kjxLbliRQJCqT9lcOODsd+v2u9PziEzBp0CCh67ftFxJw8riP2+FgdmHTK4yav9QpSwoBJHhV2SgBMGlXiqdUVC7wpgjzzK63V8abvzAhXkthWPl3kYpUI//xGYyuBNXVHEOImHB3F1M5bn90lflFtRfq2iH5FigGesMi2BFfTVeqvbzZVZrAs0E1/NRdO+/cRq0c9aRpNLkh254k1tcKbUvULQq1iLQuHN2Ramn3NgNnx93sbwp1e7ZjmETbjr9cwMIDg5mh25H0Rjf2Nn8cqHbBCWzoMkjZW097HRVDYht2kJZQIbQcaxX38DW6vykUwGWSBAWbtvCUwYwU57s/dIbSYUTQErkYYmhiq52cdOtnxZ2/ULoElCVyR8lTmQuANJrq9YFC9q1ly69YuMWWnFgwxWpK1JCgAJGELgj5EvcghEtNmkEFh5f6pmbKBE7PKQPTovzNKcdRauR/L+MsmhVYukCfNZq57LrruIQIX1GQNw9w3Ck8P4EPtNjdI4umCSy6nZSyTevWgVTmIP9EwXa5Cap32ZU+iDtw+wUBAr3sjROJOYGKlL/ktWsWbjog5hIG0rrb8PbgOfbLRZSEYGL9sYsyXXyW5oI37lB7AqG6D7vOA4TdmTQ=

binder/environment.yml

@@ -1,3 +1,6 @@
+# Dependencies for the guides cloud cost estimator notebook
+# http://mybinder.org/v2/gh/jupyterhub/zero-to-jupyterhub-k8s/master?filepath=doc/ntbk/draw_function.ipynb
+
 # Need to install bqplot with conda so it calls the javascript extension.
 name: bqplot
 channels:

ci/minikube-1.11-default.env

@@ -9,7 +9,7 @@ export Z2JH_HELM_ARGS="-f minikube-config.yaml"
 export DISABLE_TEST_NETPOL=1
 export INSTALL_CALICO=0
 
-export RUN_DEPLOY_SCRIPT=0
+export RUN_PUBLISH_SCRIPT=0
 
 # FIXME: Issue 1123
 export CRICTL_VERSION=1.11.1

ci/minikube-1.12-netpol.env

@@ -9,4 +9,4 @@ export Z2JH_HELM_ARGS="-f minikube-config.yaml -f minikube-netpol.yaml"
 export DISABLE_TEST_NETPOL=0
 export INSTALL_CALICO=1
 
-export RUN_DEPLOY_SCRIPT=0
+export RUN_PUBLISH_SCRIPT=0

ci/minikube-1.13-default.env

@@ -9,4 +9,4 @@ export Z2JH_HELM_ARGS="-f minikube-config.yaml"
 export DISABLE_TEST_NETPOL=1
 export INSTALL_CALICO=0
 
-export RUN_DEPLOY_SCRIPT=1
+export RUN_PUBLISH_SCRIPT=1

ci/publish-chart.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+set -eu
+
+# Decrypt a private SSH key having its public key registered on GitHub. It will
+# be used to establish an identity with rights to push to the repo hosting our
+# Helm charts: https://github.com/jupyterhub/helm-chart
+openssl aes-256-cbc -K $encrypted_c6b45058ffe8_key -iv $encrypted_c6b45058ffe8_iv -in ci/id_rsa.enc -out ci/id_rsa -d
+chmod 0400 ci/id_rsa
+
+docker login -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}"
+
+# Activate logging of bash commands now that the sensitive stuff is done
+set -x
+
+# As chartpress uses git to push to our Helm chart repository, we configure
+# git ahead of time to use the identity we decrypted earlier.
+export GIT_SSH_COMMAND="ssh -i ${PWD}/ci/id_rsa"
+
+chartpress --commit-range "${TRAVIS_COMMIT_RANGE}" --push --publish-chart
+
+# Let us log the changes chartpress did, it should include replacements for
+# fields in values.yaml, such as what tag for various images we are using.
+git diff

ci/travis-script.sh

@@ -6,9 +6,9 @@ python3 tools/templates/lint-and-validate.py
 if [[
     "$TRAVIS_BRANCH" == "master" &&
     "$TRAVIS_PULL_REQUEST" == "false" &&
-    "$RUN_DEPLOY_SCRIPT" == "1"
+    "$RUN_PUBLISH_SCRIPT" == "1"
 ]]; then
-    ./ci/deploy.sh
+    ./ci/publish-chart.sh
 else
     chartpress --commit-range ${TRAVIS_COMMIT_RANGE}
 fi