Skip to content

Commit 28f86b9

Browse files
authored
Merge pull request #138 from mrocklin/update-deployment
Update pangeo.pydata.org deployment
2 parents 10dc105 + 252b379 commit 28f86b9

File tree

7 files changed

+32
-34
lines changed

7 files changed

+32
-34
lines changed

gce/jupyter-config.yaml

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
proxy:
2-
secretToken: SECRET
3-
41
singleuser:
52
image:
63
name: daskdev/pangeo-notebook
7-
tag: 2018-02-22
4+
tag: 2018-03-01
85
cmd: ['start-singleuser.sh']
96
extraEnv:
107
EXTRA_PIP_PACKAGES: >-
@@ -24,29 +21,6 @@ singleuser:
2421
limit: 4G
2522
guarantee: 2G
2623

27-
28-
# proxy:
29-
# https:
30-
# hosts:
31-
# - pangeo.pydata.org
32-
# letsencrypt:
33-
# contactEmail: mrocklin@gmail.com
34-
35-
auth:
36-
type: github
37-
github:
38-
clientId: "2cb5e09d5733ff2e6ae3"
39-
clientSecret: "SECRET"
40-
callbackUrl: "http://pangeo.pydata.org/hub/oauth_callback"
41-
admin:
42-
access: true
43-
users:
44-
- mrocklin
45-
- jhamman
46-
- rabernat
47-
- yuvipanda
48-
- choldgraf
49-
5024
rbac:
5125
enabled: false
5226

gce/notebook/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ RUN pip install fusepy click jedi kubernetes --upgrade --no-cache-dir
3636
RUN pip install daskernetes==0.1.3 \
3737
git+https://github.com/zarr-developers/zarr \
3838
git+https://github.com/pydata/xarray \
39-
git+https://github.com/dask/gcsfs \
39+
gcsfs==0.0.5 \
4040
--no-cache-dir
4141

4242
RUN pip install distributed==1.21.1 \

gce/notebook/worker-template.yaml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,16 @@ metadata:
22
spec:
33
restartPolicy: Never
44
containers:
5-
- args: [dask-worker, --nthreads, '2', --no-bokeh, --memory-limit, 7GB, --death-timeout, '60']
6-
image: daskdev/pangeo-worker:2018-02-22
5+
- args:
6+
- dask-worker
7+
- --nthreads
8+
- '2'
9+
- --no-bokeh
10+
- --memory-limit
11+
- 6GB
12+
- --death-timeout
13+
- '60'
14+
image: daskdev/pangeo-worker:2018-03-01
715
name: dask-worker
816
securityContext:
917
capabilities:

gce/secret-config.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
proxy:
2+
secretToken: SECRET
3+
4+
auth:
5+
type: github
6+
github:
7+
clientId: "2cb5e09d5733ff2e6ae3"
8+
clientSecret: SECRET
9+
callbackUrl: "http://pangeo.pydata.org/hub/oauth_callback"
10+
admin:
11+
access: true
12+
users:
13+
- mrocklin
14+
- jhamman
15+
- rabernat
16+
- yuvipanda
17+
- choldgraf

gce/setup.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ helm repo add jupyterhub https://jupyterhub.github.io/helm-chart/
1414
helm repo update
1515

1616
# Install JupyterHub and Dask on the cluster
17-
helm install jupyterhub/jupyterhub --version=v0.6.0-9701a90 --name=jupyter --namespace=pangeo -f jupyter-config.yaml
18-
helm install dask/dask --name=dask --namespace=pangeo -f dask-config.yaml
17+
helm install jupyterhub/jupyterhub --version=v0.6.0-9701a90 --name=jupyter --namespace=pangeo -f jupyter-config.yaml -f secret-config.yaml
1918

2019
# Look for publised services. Route domain name A records to these IPs.
2120
kubectl get services --namespace pangeo

gce/update.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ Finally, use helm to *upgrade* the JupyterHub deployment. You will need to
9292
specify the jupyter-config.yaml file and a particular version of JupyterHub
9393

9494
```bash
95-
helm upgrade jupyter jupyterhub/jupyterhub -f jupyter-config.yaml --version=v0.6.0-9701a90
95+
helm upgrade jupyter jupyterhub/jupyterhub -f jupyter-config.yaml -f secret-config.yaml --version=v0.6.0-9701a90
9696
```
9797

9898
Verify

gce/worker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ RUN pip install pyasn1 click urllib3 --upgrade
3232

3333
RUN pip install git+https://github.com/zarr-developers/zarr \
3434
git+https://github.com/pydata/xarray \
35-
git+https://github.com/dask/gcsfs \
35+
gcsfs==0.0.5 \
3636
fusepy \
3737
--no-cache-dir
3838

0 commit comments

Comments
 (0)