Merge pull request #138 from mrocklin/update-deployment

Update pangeo.pydata.org deployment
pangeo-data · Mar 1, 2018 · 28f86b9 · 28f86b9
2 parents 10dc105 + 252b379
commit 28f86b9
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 34 deletions.
diff --git a/gce/jupyter-config.yaml b/gce/jupyter-config.yaml
@@ -1,10 +1,7 @@
-proxy:
-  secretToken: SECRET
-
 singleuser:
   image:
     name: daskdev/pangeo-notebook
-    tag: 2018-02-22
+    tag: 2018-03-01
   cmd: ['start-singleuser.sh']
   extraEnv:
     EXTRA_PIP_PACKAGES: >-
@@ -24,29 +21,6 @@ singleuser:
     limit: 4G
     guarantee: 2G
 
-
-# proxy:
-#   https:
-#     hosts:
-#       - pangeo.pydata.org
-#     letsencrypt:
-#       contactEmail: mrocklin@gmail.com
-
-auth:
-  type: github
-  github:
-    clientId: "2cb5e09d5733ff2e6ae3"
-    clientSecret: "SECRET"
-    callbackUrl: "http://pangeo.pydata.org/hub/oauth_callback"
-  admin:
-    access: true
-    users:
-      - mrocklin
-      - jhamman
-      - rabernat
-      - yuvipanda
-      - choldgraf
-
 rbac:
   enabled: false
 

diff --git a/gce/notebook/Dockerfile b/gce/notebook/Dockerfile
@@ -36,7 +36,7 @@ RUN pip install fusepy click jedi kubernetes --upgrade --no-cache-dir
 RUN pip install daskernetes==0.1.3 \
                 git+https://github.com/zarr-developers/zarr \
                 git+https://github.com/pydata/xarray \
-                git+https://github.com/dask/gcsfs \
+                gcsfs==0.0.5 \
                 --no-cache-dir
 
 RUN pip install distributed==1.21.1 \

diff --git a/gce/notebook/worker-template.yaml b/gce/notebook/worker-template.yaml
@@ -2,8 +2,16 @@ metadata:
 spec:
   restartPolicy: Never
   containers:
-  - args: [dask-worker, --nthreads, '2', --no-bokeh, --memory-limit, 7GB, --death-timeout, '60']
-    image: daskdev/pangeo-worker:2018-02-22
+  - args:
+      - dask-worker
+      - --nthreads
+      - '2'
+      - --no-bokeh
+      - --memory-limit
+      - 6GB
+      - --death-timeout
+      - '60'
+    image: daskdev/pangeo-worker:2018-03-01
     name: dask-worker
     securityContext:
       capabilities:

diff --git a/gce/secret-config.yaml b/gce/secret-config.yaml
@@ -0,0 +1,17 @@
+proxy:
+  secretToken: SECRET
+
+auth:
+  type: github
+  github:
+    clientId: "2cb5e09d5733ff2e6ae3"
+    clientSecret: SECRET
+    callbackUrl: "http://pangeo.pydata.org/hub/oauth_callback"
+  admin:
+    access: true
+    users:
+      - mrocklin
+      - jhamman
+      - rabernat
+      - yuvipanda
+      - choldgraf
diff --git a/gce/setup.sh b/gce/setup.sh
@@ -14,8 +14,7 @@ helm repo add jupyterhub https://jupyterhub.github.io/helm-chart/
 helm repo update
 
 # Install JupyterHub and Dask on the cluster
-helm install jupyterhub/jupyterhub --version=v0.6.0-9701a90 --name=jupyter --namespace=pangeo -f jupyter-config.yaml
-helm install dask/dask --name=dask --namespace=pangeo -f dask-config.yaml
+helm install jupyterhub/jupyterhub --version=v0.6.0-9701a90 --name=jupyter --namespace=pangeo -f jupyter-config.yaml -f secret-config.yaml
 
 # Look for publised services.  Route domain name A records to these IPs.
 kubectl get services --namespace pangeo

diff --git a/gce/update.md b/gce/update.md
@@ -92,7 +92,7 @@ Finally, use helm to *upgrade* the JupyterHub deployment.  You will need to
 specify the jupyter-config.yaml file and a particular version of JupyterHub
 
 ```bash
-helm upgrade jupyter jupyterhub/jupyterhub -f jupyter-config.yaml --version=v0.6.0-9701a90
+helm upgrade jupyter jupyterhub/jupyterhub -f jupyter-config.yaml -f secret-config.yaml --version=v0.6.0-9701a90
 ```
 
 Verify

diff --git a/gce/worker/Dockerfile b/gce/worker/Dockerfile
@@ -32,7 +32,7 @@ RUN pip install pyasn1 click urllib3 --upgrade
 
 RUN pip install git+https://github.com/zarr-developers/zarr \
                 git+https://github.com/pydata/xarray \
-                git+https://github.com/dask/gcsfs \
+                gcsfs==0.0.5 \
                 fusepy \
                 --no-cache-dir