diff --git a/config/clusters/2i2c/imagebuilding-demo.values.yaml b/config/clusters/2i2c/imagebuilding-demo.values.yaml
index e3215065ad..53f34fb730 100644
--- a/config/clusters/2i2c/imagebuilding-demo.values.yaml
+++ b/config/clusters/2i2c/imagebuilding-demo.values.yaml
@@ -27,10 +27,40 @@ jupyterhub:
name: ""
url: ""
custom_html: DFG, CESSDA, GESIS, FKZ/Project number 460234259
+ singleuser:
+ profileList:
+ - display_name: "Small"
+ description: "~2 CPU, ~2G RAM"
+ profile_options:
+ image:
+ display_name: Image
+ unlisted_choice: &profile_list_unlisted_choice
+ enabled: True
+ display_name: "Custom image"
+ validation_regex: "^.+:.+$"
+ validation_message: "Must be a valid public docker image, including a tag"
+ kubespawner_override:
+ image: "{value}"
+ choices:
+ pangeo_new:
+ display_name: Base Pangeo Notebook ("2023.07.05")
+ default: true
+ slug: "pangeo_new"
+ kubespawner_override:
+ image: "pangeo/pangeo-notebook:2023.07.05"
+ pangeo:
+ display_name: Base Pangeo Notebook
+ default: true
+ slug: "pangeo"
+ kubespawner_override:
+ # Explicitly unset mem_limit, so it overrides the default memory limit we set in
+ # basehub/values.yaml
+ mem_limit: 2G
+ cpu_limit: 2
hub:
image:
name: quay.io/2i2c/dynamic-image-building-experiment
- tag: "0.0.1-0.dev.git.6478.h0ab34873"
+ tag: "0.0.1-0.dev.git.6765.h33942a27"
config:
JupyterHub:
authenticator_class: cilogon
@@ -40,6 +70,13 @@ jupyterhub:
# Only show the option to login with Google
shown_idps:
- http://google.com/accounts/o8/id
+ extraConfig:
+ enable-prototype-UI: |
+ from kubespawner_dynamic_building_ui import TEMPLATE_PATHS, STATIC_HANDLER_TUPLE
+ c.KubeSpawner.additional_profile_form_template_paths = TEMPLATE_PATHS
+
+ # Add extra handler to serve JS & CSS assets
+ c.JupyterHub.extra_handlers.append(STATIC_HANDLER_TUPLE)
binderhub-service:
nodeSelector:
diff --git a/helm-charts/images/hub/dynamic-image-building-requirements.txt b/helm-charts/images/hub/dynamic-image-building-requirements.txt
index b48bd102f6..225a86b394 100644
--- a/helm-charts/images/hub/dynamic-image-building-requirements.txt
+++ b/helm-charts/images/hub/dynamic-image-building-requirements.txt
@@ -1,6 +1,6 @@
# 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@def501f1d60b8e5629745acb0bcc45b151b1decc
+git+https://github.com/jupyterhub/kubespawner@5a90351adba7d65286bd5e00e82f156011bf7b83
# Brings in https://github.com/yuvipanda/prototype-kubespawner-dynamic-building-ui
-git+https://github.com/yuvipanda/prototype-kubespawner-dynamic-building-ui@ce6fd9a67edc7cbe62dd8701954f8dd0bb94b312
+git+https://github.com/yuvipanda/prototype-kubespawner-dynamic-building-ui.git@b36ece00b5e7fcba5d4485e7ab70992705601c3c