From 65da350cec441a9799576bab75c1e102cd881c26 Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Thu, 14 Nov 2024 15:40:05 -0800 Subject: [PATCH 1/8] Add jupyterhub-fancy-profiles to pkce experimental hub image --- helm-charts/images/hub/pkce-requirements.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/helm-charts/images/hub/pkce-requirements.txt b/helm-charts/images/hub/pkce-requirements.txt index 43e986650..11eac638a 100644 --- a/helm-charts/images/hub/pkce-requirements.txt +++ b/helm-charts/images/hub/pkce-requirements.txt @@ -12,3 +12,6 @@ oauthenticator>=17.1,<18 # ref: https://github.com/yuvipanda/jupyterhub-configurator/commits/backported-jh41-compatibility # git+https://github.com/yuvipanda/jupyterhub-configurator@backported-jh41-compatibility + +# Brings in https://github.com/yuvipanda/jupyterhub-fancy-profiles +jupyterhub-fancy-profiles==0.3.9 From 4da9169bf6d8ccfe97697ac7fbd1b18d6baee152 Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Thu, 14 Nov 2024 15:54:08 -0800 Subject: [PATCH 2/8] Include base requirements in pkce hub image --- helm-charts/images/hub/pkce-requirements.txt | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/helm-charts/images/hub/pkce-requirements.txt b/helm-charts/images/hub/pkce-requirements.txt index 11eac638a..ed20822eb 100644 --- a/helm-charts/images/hub/pkce-requirements.txt +++ b/helm-charts/images/hub/pkce-requirements.txt @@ -4,14 +4,5 @@ # experiment no longer needed when base chart is updated to z2jh 4.0.0 oauthenticator>=17.1,<18 -# jupyterhub-configurator isn't maintained and its not intended to be developed -# further. We are using a branch that has forked from the main branch just -# before a breaking change were made. This allows us to avoid migrating. -# -# ref: https://github.com/yuvipanda/jupyterhub-configurator/commits/main -# ref: https://github.com/yuvipanda/jupyterhub-configurator/commits/backported-jh41-compatibility -# -git+https://github.com/yuvipanda/jupyterhub-configurator@backported-jh41-compatibility - -# Brings in https://github.com/yuvipanda/jupyterhub-fancy-profiles -jupyterhub-fancy-profiles==0.3.9 +# Include all the requirements we have for our base hub image +-r ./requirements.txt \ No newline at end of file From 382e40e4e3378bd306f6381a46897144f2b6bd6f Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Thu, 14 Nov 2024 15:54:29 -0800 Subject: [PATCH 3/8] Bump version of fancy-profiles --- helm-charts/images/hub/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-charts/images/hub/requirements.txt b/helm-charts/images/hub/requirements.txt index b1d3ef177..e633e166b 100644 --- a/helm-charts/images/hub/requirements.txt +++ b/helm-charts/images/hub/requirements.txt @@ -10,4 +10,4 @@ git+https://github.com/yuvipanda/jupyterhub-configurator@backported-jh41-compatibility # Brings in https://github.com/yuvipanda/jupyterhub-fancy-profiles -jupyterhub-fancy-profiles==0.3.9 \ No newline at end of file +jupyterhub-fancy-profiles==0.3.10 \ No newline at end of file From af476798013061779ba71ee35d2ed95b7058210d Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Thu, 14 Nov 2024 15:56:22 -0800 Subject: [PATCH 4/8] Try different format for pkce requirements file --- helm-charts/images/hub/pkce-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-charts/images/hub/pkce-requirements.txt b/helm-charts/images/hub/pkce-requirements.txt index ed20822eb..8b0dd93cb 100644 --- a/helm-charts/images/hub/pkce-requirements.txt +++ b/helm-charts/images/hub/pkce-requirements.txt @@ -5,4 +5,4 @@ oauthenticator>=17.1,<18 # Include all the requirements we have for our base hub image --r ./requirements.txt \ No newline at end of file +-r requirements.txt \ No newline at end of file From 37c70b2e614abf8badab0531de179bf60b9d8005 Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Thu, 14 Nov 2024 15:57:28 -0800 Subject: [PATCH 5/8] Don't try to include nested requirements files We only copy one file through to the hub so this won't work --- helm-charts/images/hub/pkce-requirements.txt | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/helm-charts/images/hub/pkce-requirements.txt b/helm-charts/images/hub/pkce-requirements.txt index 8b0dd93cb..09cfa3673 100644 --- a/helm-charts/images/hub/pkce-requirements.txt +++ b/helm-charts/images/hub/pkce-requirements.txt @@ -4,5 +4,15 @@ # experiment no longer needed when base chart is updated to z2jh 4.0.0 oauthenticator>=17.1,<18 -# Include all the requirements we have for our base hub image --r requirements.txt \ No newline at end of file + +# jupyterhub-configurator isn't maintained and its not intended to be developed +# further. We are using a branch that has forked from the main branch just +# before a breaking change were made. This allows us to avoid migrating. +# +# ref: https://github.com/yuvipanda/jupyterhub-configurator/commits/main +# ref: https://github.com/yuvipanda/jupyterhub-configurator/commits/backported-jh41-compatibility +# +git+https://github.com/yuvipanda/jupyterhub-configurator@backported-jh41-compatibility + +# Brings in https://github.com/yuvipanda/jupyterhub-fancy-profiles +jupyterhub-fancy-profiles==0.3.10 \ No newline at end of file From 466f9f79e1a2e3c949d23231676a34a0ae08af9c Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Thu, 14 Nov 2024 15:58:51 -0800 Subject: [PATCH 6/8] Bump 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 8ed2ed58e..6289f7005 100644 --- a/helm-charts/basehub/values.yaml +++ b/helm-charts/basehub/values.yaml @@ -1060,7 +1060,7 @@ jupyterhub: oauth_no_confirm: true image: name: quay.io/2i2c/pilot-hub - tag: "0.0.1-0.dev.git.10858.hac4e7a41" + tag: "0.0.1-0.dev.git.10892.h37c70b2e" networkPolicy: enabled: true # interNamespaceAccessLabels=accept makes the hub pod's associated From 6c1ed62f0fa2da1296016be69bbad32f32b0d84c Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Thu, 14 Nov 2024 15:59:19 -0800 Subject: [PATCH 7/8] Bump pkce image tag --- config/clusters/jupyter-health/common.values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/clusters/jupyter-health/common.values.yaml b/config/clusters/jupyter-health/common.values.yaml index cce030b98..d6667382b 100644 --- a/config/clusters/jupyter-health/common.values.yaml +++ b/config/clusters/jupyter-health/common.values.yaml @@ -43,7 +43,7 @@ jupyterhub: # image: name: quay.io/2i2c/pkce-experiment - tag: 0.0.1-0.dev.git.10694.h38ededaf + tag: 0.0.1-0.dev.git.10892.h37c70b2e allowNamedServers: true config: JupyterHub: From 901b385b3b0393501efd8c26210462939b636ff4 Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Thu, 14 Nov 2024 16:01:31 -0800 Subject: [PATCH 8/8] Make ucmerced staging match ucmerced prod --- config/clusters/2i2c/ucmerced-staging.values.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/config/clusters/2i2c/ucmerced-staging.values.yaml b/config/clusters/2i2c/ucmerced-staging.values.yaml index 76a70ac0e..58b204b57 100644 --- a/config/clusters/2i2c/ucmerced-staging.values.yaml +++ b/config/clusters/2i2c/ucmerced-staging.values.yaml @@ -13,14 +13,19 @@ jupyterhub: default: true kubespawner_override: # From https://github.com/SaiUCM/example-inherit-from-community-image - image: quay.io/cirt_ucm/jupyter-scipy-xarray:latest + # See https://2i2c.freshdesk.com/a/tickets/1612 + # See https://2i2c.freshdesk.com/a/tickets/1771 + # See https://2i2c.freshdesk.com/a/tickets/2076 + # See https://2i2c.freshdesk.com/a/tickets/2138 + # See https://2i2c.freshdesk.com/a/tickets/2396 + image: quay.io/cirt_ucm/jupyter-scipy-xarray:0b689eb927fa # Launch into JupyterLab after the user logs in default_url: /lab - display_name: R description: Start a R server with tidyverse & Geospatial tools kubespawner_override: # From https://github.com/2i2c-org/rocker-with-nbgitpuller - image: quay.io/2i2c/rocker-with-nbgitpuller:287ea05b2809 + image: quay.io/2i2c/rocker-with-nbgitpuller:3edc87d73e3d default_url: /lab # Ensures container working dir is homedir # https://github.com/2i2c-org/infrastructure/issues/2559