From 52873acb9d9ab0b2e8823c6c7689e0859f0c55e8 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Fri, 22 Sep 2023 13:26:28 -0700 Subject: [PATCH 1/3] install latest kubespawner on hub image --- images/hub/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/images/hub/Dockerfile b/images/hub/Dockerfile index 1332ff21d..896974c37 100644 --- a/images/hub/Dockerfile +++ b/images/hub/Dockerfile @@ -6,6 +6,7 @@ USER root RUN python3 -m pip install --no-cache git+https://github.com/berkeley-dsep-infra/canvasoauthenticator@09e7ed8 RUN python3 -m pip install --no-cache jupyterhub-ltiauthenticator==1.5.1 +RUN python3 -m pip install --no-cache git+https://github.com/jupyterhub/kubespawner@d60146f COPY logos /srv/logos From f9ad98e448a640f7a77d745b697026995bcc1d1f Mon Sep 17 00:00:00 2001 From: shane knapp Date: Fri, 22 Sep 2023 14:10:51 -0700 Subject: [PATCH 2/3] just use main, silly --- images/hub/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/hub/Dockerfile b/images/hub/Dockerfile index 896974c37..5744f8384 100644 --- a/images/hub/Dockerfile +++ b/images/hub/Dockerfile @@ -6,7 +6,7 @@ USER root RUN python3 -m pip install --no-cache git+https://github.com/berkeley-dsep-infra/canvasoauthenticator@09e7ed8 RUN python3 -m pip install --no-cache jupyterhub-ltiauthenticator==1.5.1 -RUN python3 -m pip install --no-cache git+https://github.com/jupyterhub/kubespawner@d60146f +RUN python3 -m pip install --no-cache git+https://github.com/jupyterhub/kubespawner@main COPY logos /srv/logos From fab4a3610d313cc569be2fbf82276911d73ce1d9 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Sun, 24 Sep 2023 10:51:24 -0700 Subject: [PATCH 3/3] update charts --- hub/Chart.yaml | 2 +- hub/values.yaml | 2 +- node-placeholder/Chart.yaml | 2 +- node-placeholder/values.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hub/Chart.yaml b/hub/Chart.yaml index 7c6165372..e4c99926e 100644 --- a/hub/Chart.yaml +++ b/hub/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: '1.0' description: Deployment Chart for JupyterHub name: hub -version: 0.0.1-n6679.hdeb3cd12 +version: 0.0.1-0.dev.git.6820.hf9ad98e4 diff --git a/hub/values.yaml b/hub/values.yaml index 3314cb6b5..415c2aa6e 100644 --- a/hub/values.yaml +++ b/hub/values.yaml @@ -219,7 +219,7 @@ jupyterhub: # Generated by chartpress image: name: gcr.io/ucb-datahub-2018/jupyterhub-hub - tag: '0.0.1-n6679.hdeb3cd12' + tag: '0.0.1-0.dev.git.6820.hf9ad98e4' networkPolicy: enabled: true ingress: diff --git a/node-placeholder/Chart.yaml b/node-placeholder/Chart.yaml index e2cea5add..46741d439 100644 --- a/node-placeholder/Chart.yaml +++ b/node-placeholder/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.0.1-n6669.h6aac4c6d +version: 0.0.1-0.dev.git.6680.h8e8b5161 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/node-placeholder/values.yaml b/node-placeholder/values.yaml index 2ff5d703c..3402eff83 100644 --- a/node-placeholder/values.yaml +++ b/node-placeholder/values.yaml @@ -4,7 +4,7 @@ image: repository: us-central1-docker.pkg.dev/ucb-datahub-2018/core/node-placeholder-scaler pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: "0.0.1-n6607.h11654cae" + tag: "0.0.1-0.dev.git.6607.h11654cae" imagePullSecrets: [] nameOverride: ""