From 93736d6583427078866616b1a81ca4b5b39813a0 Mon Sep 17 00:00:00 2001 From: Joseph Hamman Date: Tue, 16 Apr 2019 08:41:53 -0700 Subject: [PATCH 1/4] bump r2d version again --- helm-chart/pangeo-binder/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-chart/pangeo-binder/values.yaml b/helm-chart/pangeo-binder/values.yaml index 8a42e7d..8309b99 100644 --- a/helm-chart/pangeo-binder/values.yaml +++ b/helm-chart/pangeo-binder/values.yaml @@ -5,7 +5,7 @@ binderhub: config: BinderHub: use_registry: true - build_image: jupyter/repo2docker:9bcc41af + build_image: jupyter/repo2docker:746e4d92 per_repo_quota: 150 template_path: /etc/binderhub/custom/templates extra_static_path: /etc/binderhub/custom/static From ebaf59f818647709285e1f724ed4af72be749b44 Mon Sep 17 00:00:00 2001 From: Joseph Hamman Date: Tue, 16 Apr 2019 09:16:27 -0700 Subject: [PATCH 2/4] bump binderhub chart version --- helm-chart/pangeo-binder/requirements.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-chart/pangeo-binder/requirements.yaml b/helm-chart/pangeo-binder/requirements.yaml index 940a0bc..23238bc 100644 --- a/helm-chart/pangeo-binder/requirements.yaml +++ b/helm-chart/pangeo-binder/requirements.yaml @@ -1,7 +1,7 @@ # requirements.yaml dependencies: - name: binderhub - version: 0.2.0-612ade7 + version: 0.2.0-a21e7f1 repository: https://jupyterhub.github.io/helm-chart/ import-values: - child: rbac From 26d57fdae65c030a5b5b2accf305cafa19a6bd13 Mon Sep 17 00:00:00 2001 From: Joseph Hamman Date: Tue, 30 Apr 2019 15:47:20 -0700 Subject: [PATCH 3/4] bump binderhub/r2d versions --- helm-chart/pangeo-binder/requirements.yaml | 2 +- helm-chart/pangeo-binder/values.yaml | 35 ++++++++++++++-------- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/helm-chart/pangeo-binder/requirements.yaml b/helm-chart/pangeo-binder/requirements.yaml index 23238bc..f6437c8 100644 --- a/helm-chart/pangeo-binder/requirements.yaml +++ b/helm-chart/pangeo-binder/requirements.yaml @@ -1,7 +1,7 @@ # requirements.yaml dependencies: - name: binderhub - version: 0.2.0-a21e7f1 + version: 0.2.0-10ac4d8 repository: https://jupyterhub.github.io/helm-chart/ import-values: - child: rbac diff --git a/helm-chart/pangeo-binder/values.yaml b/helm-chart/pangeo-binder/values.yaml index 8309b99..afcfea2 100644 --- a/helm-chart/pangeo-binder/values.yaml +++ b/helm-chart/pangeo-binder/values.yaml @@ -5,7 +5,7 @@ binderhub: config: BinderHub: use_registry: true - build_image: jupyter/repo2docker:746e4d92 + build_image: jupyter/repo2docker:9099def4 per_repo_quota: 150 template_path: /etc/binderhub/custom/templates extra_static_path: /etc/binderhub/custom/static @@ -26,15 +26,6 @@ binderhub: ingress.kubernetes.io/proxy-body-size: 64m kubernetes.io/ingress.class: nginx kubernetes.io/tls-acme: 'true' - # scheduling: - # userScheduler: - # enabled: true - # replicas: 2 - # podPriority: - # enabled: true - # userPlaceholder: - # enabled: true - # replicas: 2 cull: # cull every 11 minutes so it is out of phase # with the proxy check-routes interval of five minutes @@ -44,7 +35,7 @@ binderhub: maxAge: 10800 singleuser: serviceAccountName: daskkubernetes - # start jupyter notebook + # start jupyter lab cmd: jupyter-lab cloudMetadata: enabled: true @@ -104,7 +95,20 @@ binderhub: - name: custom-templates mountPath: /etc/binderhub/custom dind: - enabled: True + enabled: true + daemonset: + image: + name: docker + tag: 18.09.2-dind + + imageCleaner: + enabled: true + # when 80% of inodes are used, + # cull images until only 40% are used. + imageGCThresholdHigh: 80 + imageGCThresholdLow: 40 + host: + enabled: false nginx-ingress: rbac: @@ -119,6 +123,13 @@ nginx-ingress: config: # Allow POSTs of upto 64MB, for large notebook support. proxy-body-size: 64m + resources: + requests: + cpu: 0.5 + memory: 240Mi + limits: + cpu: 0.8 + memory: 240Mi service: # Preserve client IPs From 24ff4f5f1d394eda80abb1b01824352f8b94e0a7 Mon Sep 17 00:00:00 2001 From: Joseph Hamman Date: Tue, 30 Apr 2019 22:27:11 -0700 Subject: [PATCH 4/4] sep host socet dirs for prod/staging --- deploy/prod.yaml | 3 +++ deploy/staging.yaml | 14 ++++++++++---- helm-chart/pangeo-binder/values.yaml | 7 +++++++ 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/deploy/prod.yaml b/deploy/prod.yaml index 5af0e3f..445b43a 100644 --- a/deploy/prod.yaml +++ b/deploy/prod.yaml @@ -16,6 +16,9 @@ binderhub: hosts: - binder.pangeo.io + dind: + hostSocketDir: /var/run/dind/prod/docker.sock + jupyterhub: singleuser: nodeSelector: diff --git a/deploy/staging.yaml b/deploy/staging.yaml index 34ff71f..bf3011f 100644 --- a/deploy/staging.yaml +++ b/deploy/staging.yaml @@ -15,6 +15,16 @@ binderhub: hosts: - staging.binder.pangeo.io + dind: + hostSocketDir: /var/run/dind/staging/docker.sock + resources: + requests: + cpu: "1" + memory: 2Gi + limits: + cpu: "2" + memory: 4Gi + jupyterhub: singleuser: nodeSelector: @@ -32,10 +42,6 @@ binderhub: - secretName: kubelego-tls-jupyterhub-staging hosts: - hub.staging.binder.pangeo.io - # scheduling: - # userScheduler: - # nodeSelector: - # cloud.google.com/gke-nodepool: default-pool kube-lego: nodeSelector: diff --git a/helm-chart/pangeo-binder/values.yaml b/helm-chart/pangeo-binder/values.yaml index afcfea2..564beb9 100644 --- a/helm-chart/pangeo-binder/values.yaml +++ b/helm-chart/pangeo-binder/values.yaml @@ -100,6 +100,13 @@ binderhub: image: name: docker tag: 18.09.2-dind + resources: + requests: + cpu: "2" + memory: 8Gi + limits: + cpu: "5" + memory: 12Gi imageCleaner: enabled: true