From b54fb723486f5a9d075ca727ac8c4f35db86af72 Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Fri, 24 Jun 2022 14:11:12 -0700 Subject: [PATCH 1/9] Bump z2jh version - Bump base image of our hub image too --- helm-charts/basehub/Chart.yaml | 2 +- helm-charts/images/hub/Dockerfile | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/helm-charts/basehub/Chart.yaml b/helm-charts/basehub/Chart.yaml index 83a831aff1..4b76ee29f8 100644 --- a/helm-charts/basehub/Chart.yaml +++ b/helm-charts/basehub/Chart.yaml @@ -11,5 +11,5 @@ dependencies: # images/hub/Dockerfile, and will also involve manually building and pushing # the Dockerfile to https://quay.io/2i2c/pilot-hub. Details about this can # be found in the Dockerfile's comments. - version: 1.2.0 + version: 1.1.3-n648.hab95aa08 repository: https://jupyterhub.github.io/helm-chart/ diff --git a/helm-charts/images/hub/Dockerfile b/helm-charts/images/hub/Dockerfile index 7bf49ecad9..e835f1717c 100644 --- a/helm-charts/images/hub/Dockerfile +++ b/helm-charts/images/hub/Dockerfile @@ -6,18 +6,12 @@ # quay.io container registry credentials configured to have access to # https://quay.io/repository/2i2c/pilot-hub. # -FROM jupyterhub/k8s-hub:1.2.0 +FROM jupyterhub/k8s-hub:1.1.3-n644.h35436cda ENV CONFIGURATOR_VERSION ed7e3a0df1e3d625d10903ef7d7fd9c2fbb548db RUN pip install --no-cache git+https://github.com/yuvipanda/jupyterhub-configurator@${CONFIGURATOR_VERSION} - -# Install newer version of jupyterhub-kubespawner, to bring in https://github.com/jupyterhub/kubespawner/pull/525 -# https://github.com/2i2c-org/infrastructure/issues/1103 is happening frequently enough -# z2jh 1.2.x ships with kubespawner 1.1.0, so we just do a little bump -RUN pip install --no-cache --upgrade jupyterhub-kubespawner==1.1.2 - # Latest version comes with some breaking changes https://oauthenticator.readthedocs.io/en/latest/migrations.html#migrating-cilogonoauthenticator-to-version-15-0 RUN pip install --no-cache --upgrade oauthenticator==15.0.1 From 14ce5980c130711a73bc8ccec6612b5349433138 Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Fri, 24 Jun 2022 14:13:38 -0700 Subject: [PATCH 2/9] Bump hub image tag --- helm-charts/basehub/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-charts/basehub/values.yaml b/helm-charts/basehub/values.yaml index 3674456fbc..45335333ae 100644 --- a/helm-charts/basehub/values.yaml +++ b/helm-charts/basehub/values.yaml @@ -321,7 +321,7 @@ jupyterhub: admin: true image: name: quay.io/2i2c/pilot-hub - tag: "0.0.1-n3288.h27beafd1" + tag: "0.0.1-n3429.h31787df0" nodeSelector: hub.jupyter.org/node-purpose: core networkPolicy: From d7df345e245829bf9986ae319dbf45c23630eb7e Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Fri, 24 Jun 2022 14:40:21 -0700 Subject: [PATCH 3/9] Explicitly specify default command --- helm-charts/basehub/values.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/helm-charts/basehub/values.yaml b/helm-charts/basehub/values.yaml index 45335333ae..2a23e7f251 100644 --- a/helm-charts/basehub/values.yaml +++ b/helm-charts/basehub/values.yaml @@ -135,6 +135,10 @@ jupyterhub: limits: memory: 1Gi singleuser: + cmd: + # Explicitly define this, as it's no longer set by z2jh + # https://github.com/jupyterhub/zero-to-jupyterhub-k8s/pull/2449 + - jupyterhub-singleuser extraEnv: # notebook writes secure files that don't need to survive a # restart here. Writing 'secure' files on some file systems (like From 8843637add9deabb91e5f7570eb59709a9d8dea6 Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Fri, 24 Jun 2022 15:12:42 -0700 Subject: [PATCH 4/9] Bump image of dask-staging hub The previous one was more than a year old, and it was running jupyterhub 1.3.0 inside --- config/clusters/2i2c/dask-staging.values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/clusters/2i2c/dask-staging.values.yaml b/config/clusters/2i2c/dask-staging.values.yaml index 35e69c63d9..c040f9ec96 100644 --- a/config/clusters/2i2c/dask-staging.values.yaml +++ b/config/clusters/2i2c/dask-staging.values.yaml @@ -31,7 +31,7 @@ basehub: singleuser: image: name: pangeo/pangeo-notebook - tag: "2021.02.19" + tag: "2022.06.02" hub: config: JupyterHub: From ac9a6efcbdf792855ffadc9494e638b6746a8f35 Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Fri, 24 Jun 2022 15:35:21 -0700 Subject: [PATCH 5/9] Bump image tag for meom-ige --- config/clusters/meom-ige/common.values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/clusters/meom-ige/common.values.yaml b/config/clusters/meom-ige/common.values.yaml index 4c461e17a0..cdc823a1c2 100644 --- a/config/clusters/meom-ige/common.values.yaml +++ b/config/clusters/meom-ige/common.values.yaml @@ -77,7 +77,7 @@ basehub: defaultUrl: /lab image: name: pangeo/pangeo-notebook - tag: "2021.07.17" + tag: "2022.06.13" scheduling: userPlaceholder: enabled: false From a0f9d7d71f1051c8f63011205bd3c98e66979d50 Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Fri, 24 Jun 2022 15:36:05 -0700 Subject: [PATCH 6/9] Use notebook server rather than jupyter server still Until all user notebooks get up to latest JupyterHub --- helm-charts/basehub/values.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/helm-charts/basehub/values.yaml b/helm-charts/basehub/values.yaml index 2a23e7f251..c76d9b66f8 100644 --- a/helm-charts/basehub/values.yaml +++ b/helm-charts/basehub/values.yaml @@ -140,6 +140,9 @@ jupyterhub: # https://github.com/jupyterhub/zero-to-jupyterhub-k8s/pull/2449 - jupyterhub-singleuser extraEnv: + # until https://github.com/jupyterhub/jupyterhub/pull/3918 or equivalent lands, + # and we upgrade to jupyterhub >= 2.3.1 on all images. + JUPYTERHUB_SINGLEUSER_APP: "notebook.notebookapp.NotebookApp" # notebook writes secure files that don't need to survive a # restart here. Writing 'secure' files on some file systems (like # Azure Files with SMB) seems buggy, so we just put runtime dir on From c4ac158363541f9493846408ac65e5fecf8a7d32 Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Wed, 6 Jul 2022 14:41:49 -0700 Subject: [PATCH 7/9] Allow users to access services --- helm-charts/basehub/values.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/helm-charts/basehub/values.yaml b/helm-charts/basehub/values.yaml index c76d9b66f8..4a70fd9b53 100644 --- a/helm-charts/basehub/values.yaml +++ b/helm-charts/basehub/values.yaml @@ -254,6 +254,15 @@ jupyterhub: matchLabels: app.kubernetes.io/component: traefik hub: + loadRoles: + # Should use this, not hub.config.JupyterHub.load_roles - that will + # override any existing load_roles set by z2jh + service-use: + name: user + scopes: + # Allow all users access to 'services', which includes dask-gateway & configurator + - access:services + - self config: JupyterHub: # Allow unauthenticated prometheus requests From 4b095c293321789d822bb840ee672c90dafecca8 Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Wed, 6 Jul 2022 14:52:59 -0700 Subject: [PATCH 8/9] Update default hub user image --- helm-charts/basehub/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-charts/basehub/values.yaml b/helm-charts/basehub/values.yaml index 4a70fd9b53..619ca789a9 100644 --- a/helm-charts/basehub/values.yaml +++ b/helm-charts/basehub/values.yaml @@ -176,7 +176,7 @@ jupyterhub: hub.jupyter.org/node-purpose: user image: name: quay.io/2i2c/2i2c-hubs-image - tag: "532c5eab47a1" + tag: 69b1f9dff7c7 storage: type: static static: From 6e7659fc43fdb5493c5e873978dd3616fe49f440 Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Wed, 6 Jul 2022 15:17:02 -0700 Subject: [PATCH 9/9] Rebuild & bump hub image tag --- helm-charts/basehub/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-charts/basehub/values.yaml b/helm-charts/basehub/values.yaml index 619ca789a9..f7024a14e4 100644 --- a/helm-charts/basehub/values.yaml +++ b/helm-charts/basehub/values.yaml @@ -337,7 +337,7 @@ jupyterhub: admin: true image: name: quay.io/2i2c/pilot-hub - tag: "0.0.1-n3429.h31787df0" + tag: "0.0.1-n3521.hb54fb723" nodeSelector: hub.jupyter.org/node-purpose: core networkPolicy: