Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to z2jh 4 #5292

Draft
wants to merge 11 commits into
base: main
Choose a base branch
from
2 changes: 1 addition & 1 deletion config/clusters/2i2c-aws-us/itcoocean.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jupyterhub:
volumeMounts:
- name: home
mountPath: /home/jovyan
subPath: "{username}"
subPath: "{escaped_username}"
# Mounted without readonly attribute here,
# so we can chown it appropriately
- name: home
Expand Down
2 changes: 1 addition & 1 deletion config/clusters/hhmi/daskhub-common.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ basehub:
volumeMounts:
- name: home
mountPath: /home/jovyan
subPath: "{username}"
subPath: "{escaped_username}"
# Mounted without readonly attribute here,
# so we can chown it appropriately
- name: home
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ basehub:
volumeMounts:
- name: home
mountPath: /home/jovyan
subPath: "{username}"
subPath: "{escaped_username}"
- name: home
mountPath: /home/jovyan/shared
subPath: _shared
Expand Down
4 changes: 2 additions & 2 deletions config/clusters/maap/common.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jupyterhub:
volumeMounts:
- name: home
mountPath: /home/jovyan
subPath: "{username}"
subPath: "{escaped_username}"
# Mounted without readonly attribute here,
# so we can chown it appropriately
- name: home
Expand Down Expand Up @@ -137,7 +137,7 @@ jupyterhub:
volumeMounts:
- name: home
mountPath: /home/jovyan
subPath: "{username}"
subPath: "{escaped_username}"
securityContext:
runAsUser: 1000
runAsGroup: 1000
Expand Down
2 changes: 1 addition & 1 deletion config/clusters/maap/prod.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jupyterhub:
volumeMounts:
- name: home
mountPath: /home/jovyan
subPath: "{username}"
subPath: "{escaped_username}"
# Mounted without readonly attribute here,
# so we can chown it appropriately
- name: home
Expand Down
2 changes: 1 addition & 1 deletion config/clusters/maap/staging.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jupyterhub:
volumeMounts:
- name: home
mountPath: /home/jovyan
subPath: "{username}"
subPath: "{escaped_username}"
# Mounted without readonly attribute here,
# so we can chown it appropriately
- name: home
Expand Down
2 changes: 1 addition & 1 deletion config/clusters/nasa-cryo/common.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ basehub:
volumeMounts:
- name: home
mountPath: /home/jovyan
subPath: "{username}"
subPath: "{escaped_username}"
# Mounted without readonly attribute here,
# so we can chown it appropriately
- name: home
Expand Down
4 changes: 2 additions & 2 deletions config/clusters/nasa-ghg/common.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ basehub:
volumeMounts:
- name: home
mountPath: /home/jovyan
subPath: "{username}"
subPath: "{escaped_username}"
# mounted without readonly attribute here,
# so we can chown it appropriately
- name: home
Expand All @@ -119,7 +119,7 @@ basehub:
volumeMounts:
- name: home
mountPath: /home/jovyan
subPath: "{username}"
subPath: "{escaped_username}"
securityContext:
runAsUser: 1000
runAsGroup: 1000
Expand Down
4 changes: 2 additions & 2 deletions config/clusters/nasa-ghg/staging.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ basehub:
volumeMounts:
- name: home
mountPath: /home/jovyan
subPath: "{username}"
subPath: "{escaped_username}"
# mounted without readonly attribute here,
# so we can chown it appropriately
- name: home
Expand All @@ -94,7 +94,7 @@ basehub:
volumeMounts:
- name: home
mountPath: /home/jovyan
subPath: "{username}"
subPath: "{escaped_username}"
securityContext:
runAsUser: 1000
runAsGroup: 1000
Expand Down
4 changes: 2 additions & 2 deletions config/clusters/nasa-veda/common.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ basehub:
volumeMounts:
- name: home
mountPath: /home/jovyan
subPath: "{username}"
subPath: "{escaped_username}"
# Mounted without readonly attribute here,
# so we can chown it appropriately
- name: home
Expand Down Expand Up @@ -154,7 +154,7 @@ basehub:
volumeMounts:
- name: home
mountPath: /home/jovyan
subPath: "{username}"
subPath: "{escaped_username}"
securityContext:
runAsUser: 1000
runAsGroup: 1000
Expand Down
2 changes: 1 addition & 1 deletion config/clusters/nasa-veda/staging.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ basehub:
volumeMounts:
- name: home
mountPath: /home/jovyan
subPath: "{username}"
subPath: "{escaped_username}"
# Mounted without readonly attribute here,
# so we can chown it appropriately
- name: home
Expand Down
4 changes: 2 additions & 2 deletions docs/howto/features/per-user-db.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jupyterhub:
volumeMounts:
- name: home
mountPath: /home/jovyan
subPath: "{username}"
subPath: "{escaped_username}"
# Mounted without readonly attribute here,
# so we can chown it appropriately
- name: home
Expand Down Expand Up @@ -132,7 +132,7 @@ jupyterhub:
# that load data into the db from disk work
- name: home
mountPath: /home/jovyan
subPath: "{username}"
subPath: "{escaped_username}"
- name: postgres-db
mountPath: /var/lib/postgresql/data
# postgres recommends against mounting a volume directly here
Expand Down
2 changes: 1 addition & 1 deletion docs/topic/infrastructure/storage-layer.md
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ jupyterhub:
volumeMounts:
- name: home
mountPath: /home/jovyan
subPath: "{username}"
subPath: "{escaped_username}"
# Mounted without readonly attribute here,
# so we can chown it appropriately
- name: home
Expand Down
2 changes: 1 addition & 1 deletion helm-charts/basehub/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies:
# images/hub/Dockerfile, and will also involve manually building and pushing
# the Dockerfile to https://quay.io/2i2c/pilot-hub. Details about this can
# be found in the Dockerfile's comments.
version: 3.3.7
version: 4.0.0
repository: https://jupyterhub.github.io/helm-chart/
- name: binderhub-service
version: 0.1.0-0.dev.git.282.he1ac64b
Expand Down
13 changes: 6 additions & 7 deletions helm-charts/basehub/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ binderhub-service:
log_name = "binderhub-event-logs"
get_logger().info(f"Sending logs of launch events to a 2i2c managed GCP project {client.project} under log name {log_name}.")
return [CloudLoggingHandler(client, name=log_name)]
c.EventLog.handlers_maker = _make_eventsink_handler
c.EventLogger.handlers_maker = _make_eventsink_handler

ingressBasicAuth:
enabled: false
Expand Down Expand Up @@ -414,8 +414,7 @@ jupyterhub:
- [email protected]
homepage:
gitRepoUrl: "https://github.com/2i2c-org/default-hub-homepage"
# TODO: make main the default branch in the repo above
gitRepoBranch: "master"
gitRepoBranch: "bootstrap5"
templateVars:
enabled: true
jupyterhubConfigurator:
Expand Down Expand Up @@ -549,7 +548,7 @@ jupyterhub:
volumeMounts:
- name: home
mountPath: /home/jovyan
subPath: "{username}"
subPath: "{escaped_username}"
# Mounted without readonly attribute here,
# so we can chown it appropriately
- name: home
Expand Down Expand Up @@ -769,7 +768,7 @@ jupyterhub:
type: static
static:
pvcName: home-nfs
subPath: "{username}"
subPath: "{escaped_username}"
extraVolumes:
- name: dev-shm
emptyDir:
Expand All @@ -794,7 +793,7 @@ jupyterhub:
# problem by openscapes)
- name: home
mountPath: /home/rstudio
subPath: "{username}"
subPath: "{escaped_username}"
- name: home
mountPath: /home/rstudio/shared
subPath: _shared
Expand Down Expand Up @@ -1057,7 +1056,7 @@ jupyterhub:
oauth_no_confirm: true
image:
name: quay.io/2i2c/pilot-hub
tag: "0.0.1-0.dev.git.10892.h37c70b2e"
tag: "0.0.1-0.dev.git.11322.hb977bf05"
networkPolicy:
enabled: true
# interNamespaceAccessLabels=accept makes the hub pod's associated
Expand Down
6 changes: 0 additions & 6 deletions helm-charts/chartpress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@ charts:
valuesPath: jupyterhub.hub.image
buildArgs:
REQUIREMENTS_FILE: requirements.txt
dynamic-image-building-experiment:
imageName: quay.io/2i2c/dynamic-image-building-experiment
buildArgs:
REQUIREMENTS_FILE: dynamic-image-building-requirements.txt
contextPath: images/hub
dockerfilePath: images/hub/Dockerfile
pkce-experiment:
imageName: quay.io/2i2c/pkce-experiment
buildArgs:
Expand Down
3 changes: 2 additions & 1 deletion helm-charts/images/hub/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# `chartpress --push --builder docker-buildx --platform linux/amd64`
# Ref: https://cloudolife.com/2022/03/05/Infrastructure-as-Code-IaC/Container/Docker/Docker-buildx-support-multiple-architectures-images/
#
FROM jupyterhub/k8s-hub:3.3.7
FROM jupyterhub/k8s-hub:4.0.0

# chartpress.yaml defines multiple hub images differentiated only by a
# requirements.txt file with dependencies, this build argument allows us to
Expand All @@ -21,6 +21,7 @@ ARG REQUIREMENTS_FILE
COPY ${REQUIREMENTS_FILE} /tmp/

USER root

RUN pip install -r /tmp/${REQUIREMENTS_FILE}

RUN mkdir -p /usr/local/etc/jupyterhub-configurator
Expand Down
13 changes: 0 additions & 13 deletions helm-charts/images/hub/dynamic-image-building-requirements.txt

This file was deleted.

3 changes: 1 addition & 2 deletions helm-charts/images/hub/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,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.10
jupyterhub-fancy-profiles==0.4.0
Loading