Skip to content

Commit

Permalink
Merge pull request #5112 from yuvipanda/jh
Browse files Browse the repository at this point in the history
Fix bug with jupyterhub-fancy-profiles rollout
  • Loading branch information
yuvipanda authored Nov 15, 2024
2 parents df79813 + 901b385 commit 1565ac7
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 5 deletions.
9 changes: 7 additions & 2 deletions config/clusters/2i2c/ucmerced-staging.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/clusters/jupyter-health/common.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion helm-charts/basehub/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions helm-charts/images/hub/pkce-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
# 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.
Expand All @@ -12,3 +13,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.10
2 changes: 1 addition & 1 deletion helm-charts/images/hub/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
jupyterhub-fancy-profiles==0.3.10

0 comments on commit 1565ac7

Please sign in to comment.