From a1b6098a315cfddcb8c13e2c8a9e3932af6d33a4 Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Sat, 19 Mar 2022 13:32:22 -0700 Subject: [PATCH 1/3] Bump up kubespawner version https://github.com/2i2c-org/infrastructure/issues/1103 is happening more frequently now, and it's a hard fail - many users just can not start up their servers. The z2jh upgrade will involve more work (https://github.com/2i2c-org/infrastructure/issues/1055), so let's just bump up kubespawner in our custom hub image until then. Fixes https://github.com/2i2c-org/infrastructure/issues/1103 --- helm-charts/images/hub/Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/helm-charts/images/hub/Dockerfile b/helm-charts/images/hub/Dockerfile index f64e0e8e22..3414b2db31 100644 --- a/helm-charts/images/hub/Dockerfile +++ b/helm-charts/images/hub/Dockerfile @@ -12,6 +12,12 @@ 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 + USER root RUN mkdir -p /usr/local/etc/jupyterhub-configurator From 1bc7490872035cae16f5cde3894eec851cf748a4 Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Sat, 19 Mar 2022 13:35:18 -0700 Subject: [PATCH 2/3] Reword document to distinguish user image from hub image Hub image is the custom image we use to run the hub process itself --- docs/howto/customize/custom-image.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/howto/customize/custom-image.md b/docs/howto/customize/custom-image.md index eeb65d0974..c913e9c7ea 100644 --- a/docs/howto/customize/custom-image.md +++ b/docs/howto/customize/custom-image.md @@ -1,5 +1,5 @@ (customize/custom-image)= -# Use a custom hub image +# Use a custom user image Community hubs use an image we curate as the default. This can be replaced with your own custom image fairly easily. However, custom images should be maintained From 3cfad76b5c38198d1b3cc22e3197b87941d8ec0f Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Sat, 19 Mar 2022 13:36:40 -0700 Subject: [PATCH 3/3] Bump hub user 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 cd82dd699a..7707b8606f 100644 --- a/helm-charts/basehub/values.yaml +++ b/helm-charts/basehub/values.yaml @@ -288,7 +288,7 @@ jupyterhub: - --Configurator.config_file=/usr/local/etc/jupyterhub-configurator/jupyterhub_configurator_config.py image: name: quay.io/2i2c/pilot-hub - tag: "0.0.1-n2453.h7734a80" + tag: "0.0.1-n2546.ha1b6098" nodeSelector: hub.jupyter.org/node-purpose: core networkPolicy: