Permalink
Browse files

Merge pull request #138 from mrocklin/update-deployment

Update pangeo.pydata.org deployment
  • Loading branch information...
rabernat committed Mar 1, 2018
2 parents 10dc105 + 252b379 commit 28f86b9c836bd622daa14d5c9b48ab73bbed4c73
Showing with 32 additions and 34 deletions.
  1. +1 −27 gce/jupyter-config.yaml
  2. +1 −1 gce/notebook/Dockerfile
  3. +10 −2 gce/notebook/worker-template.yaml
  4. +17 −0 gce/secret-config.yaml
  5. +1 −2 gce/setup.sh
  6. +1 −1 gce/update.md
  7. +1 −1 gce/worker/Dockerfile
@@ -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

@@ -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 \
@@ -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:
@@ -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
@@ -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
@@ -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
@@ -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

0 comments on commit 28f86b9

Please sign in to comment.