From 013054f7ff9951b8ec9342850a9edba306ef909b Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Tue, 19 Sep 2023 00:15:35 -0700 Subject: [PATCH 1/5] Bump version of kubespawner dynamic-builder UI --- helm-charts/images/hub/dynamic-image-building-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-charts/images/hub/dynamic-image-building-requirements.txt b/helm-charts/images/hub/dynamic-image-building-requirements.txt index d56d915008..a8545ec2b6 100644 --- a/helm-charts/images/hub/dynamic-image-building-requirements.txt +++ b/helm-charts/images/hub/dynamic-image-building-requirements.txt @@ -3,4 +3,4 @@ git+https://github.com/yuvipanda/jupyterhub-configurator@ed7e3a0df1e3d625d10903e # Brings on using `unlisted_choice` in profile options per https://github.com/2i2c-org/infrastructure/issues/2146 git+https://github.com/jupyterhub/kubespawner@9663b7e0f0d3942962c99a39c375358f19e0718e # Brings in https://github.com/yuvipanda/prototype-kubespawner-dynamic-building-ui -git+https://github.com/yuvipanda/prototype-kubespawner-dynamic-building-ui.git@19aa3685069894aa8e8236b9865795cd17994f8f +git+https://github.com/yuvipanda/prototype-kubespawner-dynamic-building-ui.git@e7a3b86879ada4065d70343b51453e144ab6cad3 From 7f8bfbd1dc327f1e23e8f9cdcffd15a33f432188 Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Tue, 19 Sep 2023 00:18:10 -0700 Subject: [PATCH 2/5] Bump built hub image tag --- config/clusters/2i2c/imagebuilding-demo.values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/clusters/2i2c/imagebuilding-demo.values.yaml b/config/clusters/2i2c/imagebuilding-demo.values.yaml index 8983d12149..821c816356 100644 --- a/config/clusters/2i2c/imagebuilding-demo.values.yaml +++ b/config/clusters/2i2c/imagebuilding-demo.values.yaml @@ -121,7 +121,7 @@ jupyterhub: url: http://imagebuilding-demo-binderhub-service:8090 image: name: quay.io/2i2c/dynamic-image-building-experiment - tag: "0.0.1-0.dev.git.7029.h44cd314e" + tag: "0.0.1-0.dev.git.7058.h013054f7" config: JupyterHub: authenticator_class: github From 0593e80c7239b6c00bc3ef4adec5f79e14799a6d Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Tue, 19 Sep 2023 00:24:06 -0700 Subject: [PATCH 3/5] Bump kubespawner to bring in unrelased PR Brings in https://github.com/jupyterhub/kubespawner/pull/787 --- helm-charts/images/hub/dynamic-image-building-requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/helm-charts/images/hub/dynamic-image-building-requirements.txt b/helm-charts/images/hub/dynamic-image-building-requirements.txt index a8545ec2b6..c86b4f31c1 100644 --- a/helm-charts/images/hub/dynamic-image-building-requirements.txt +++ b/helm-charts/images/hub/dynamic-image-building-requirements.txt @@ -1,6 +1,7 @@ # Image lives at quay.io/2i2c/second-hub-experimental git+https://github.com/yuvipanda/jupyterhub-configurator@ed7e3a0df1e3d625d10903ef7d7fd9c2fbb548db # Brings on using `unlisted_choice` in profile options per https://github.com/2i2c-org/infrastructure/issues/2146 -git+https://github.com/jupyterhub/kubespawner@9663b7e0f0d3942962c99a39c375358f19e0718e +# Brings in https://github.com/jupyterhub/kubespawner/pull/787 +git+https://github.com/yuvipanda/kubespawner@46d561d2687b3d6d5ea0dd0e25db42945c886b91 # Brings in https://github.com/yuvipanda/prototype-kubespawner-dynamic-building-ui git+https://github.com/yuvipanda/prototype-kubespawner-dynamic-building-ui.git@e7a3b86879ada4065d70343b51453e144ab6cad3 From 34c361120d8c67a27caae7c63a510db816c6c111 Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Tue, 19 Sep 2023 00:24:36 -0700 Subject: [PATCH 4/5] Add some descriptions to our options --- config/clusters/2i2c/imagebuilding-demo.values.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/clusters/2i2c/imagebuilding-demo.values.yaml b/config/clusters/2i2c/imagebuilding-demo.values.yaml index 821c816356..16cf5458d5 100644 --- a/config/clusters/2i2c/imagebuilding-demo.values.yaml +++ b/config/clusters/2i2c/imagebuilding-demo.values.yaml @@ -44,10 +44,12 @@ jupyterhub: choices: pangeo: display_name: Pangeo Notebook Image + description: "Python image with scientific, dask and geospatial tools" kubespawner_override: image: pangeo/pangeo-notebook:2023.09.11 geospatial: display_name: Rocker Geospatial + description: "R image with RStudio, the tidyverse & Geospatial tools" default: true slug: geospatial kubespawner_override: @@ -78,6 +80,7 @@ jupyterhub: choices: mem_2_7: display_name: 2.7 GB RAM, upto 3.479 CPUs + description: "Use this for the workshop on 2023 September" kubespawner_override: mem_guarantee: 2904451072 mem_limit: 2904451072 @@ -106,6 +109,7 @@ jupyterhub: node.kubernetes.io/instance-type: n1-highmem-4 mem_21_6: display_name: 21.6 GB RAM, upto 3.479 CPUs + description: "Largest amount of RAM, might take a few minutes to start" kubespawner_override: mem_guarantee: 23235608576 mem_limit: 23235608576 From c8a3748eda12214f6a6cd5715a1393e1b2c8f0bc Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Tue, 19 Sep 2023 00:27:03 -0700 Subject: [PATCH 5/5] Bump up image tag --- config/clusters/2i2c/imagebuilding-demo.values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/clusters/2i2c/imagebuilding-demo.values.yaml b/config/clusters/2i2c/imagebuilding-demo.values.yaml index 16cf5458d5..e6a88539e1 100644 --- a/config/clusters/2i2c/imagebuilding-demo.values.yaml +++ b/config/clusters/2i2c/imagebuilding-demo.values.yaml @@ -125,7 +125,7 @@ jupyterhub: url: http://imagebuilding-demo-binderhub-service:8090 image: name: quay.io/2i2c/dynamic-image-building-experiment - tag: "0.0.1-0.dev.git.7058.h013054f7" + tag: "0.0.1-0.dev.git.7060.h0593e80c" config: JupyterHub: authenticator_class: github