Update hub image

docs/topic/hub-image.md

@@ -41,6 +41,12 @@ When this hub image needs to be updated, the steps to take are:
 
      This package is also listed under `dev-requirements.txt`, so it should be present if you've installed the dev dependencies.
 
+   - Make sure you are in the `helm-charts` directory, where the `chartpress.yaml` is located:
+
+     ```bash
+     cd ./helm-charts
+     ```
+
    - Run chartpress to build the image, push it to the registry and update the basehub helm chart to use the updated image tag
 
      ```bash

helm-charts/basehub/values.yaml

@@ -379,7 +379,7 @@ jupyterhub:
         admin: true
     image:
       name: quay.io/2i2c/pilot-hub
-      tag: "0.0.1-0.dev.git.3965.h1842c071"
+      tag: "0.0.1-n4340.ha8608773"
     nodeSelector:
       hub.jupyter.org/node-purpose: core
     networkPolicy:

helm-charts/images/hub/Dockerfile

@@ -2,9 +2,10 @@
 # declared in basehub/Chart.yaml.
 #
 # If you make an update to this tag and the JupyterHub Helm chart's version,
-# then commit those changes and then perform `chartpress --push` with your
-# quay.io container registry credentials configured to have access to
-# https://quay.io/repository/2i2c/pilot-hub.
+# then first commit those changes.
+# Then, from the `helm-charts` directory where the `chartpress.yaml` is located,
+# perform `chartpress --push` with your quay.io container registry credentials
+# configured to have access to https://quay.io/repository/2i2c/pilot-hub.
 #
 # Note: if on macOs with M1, you need to run chartpress with docker buildx under the hood and specify
 # the architecture to use.
@@ -13,12 +14,9 @@
 #
 FROM jupyterhub/k8s-hub:2.0.1-0.dev.git.5840.h71ad2287
 
-ENV CONFIGURATOR_VERSION ed7e3a0df1e3d625d10903ef7d7fd9c2fbb548db
+COPY requirements.txt /tmp/
 
-RUN pip install --no-cache git+https://github.com/yuvipanda/jupyterhub-configurator@${CONFIGURATOR_VERSION}
-
-# Latest version comes with some breaking changes https://oauthenticator.readthedocs.io/en/latest/migrations.html#migrating-cilogonoauthenticator-to-version-15-0
-RUN pip install --no-cache --upgrade git+https://github.com/jupyterhub/oauthenticator@6cf6599d99b47f99db3826ceaaedf467af14a05d
+RUN pip install -r /tmp/requirements.txt
 
 USER root
 RUN mkdir -p /usr/local/etc/jupyterhub-configurator

helm-charts/images/hub/requirements.txt

@@ -0,0 +1,4 @@
+oauthenticator==15.1.0
+git+https://github.com/yuvipanda/jupyterhub-configurator@ed7e3a0df1e3d625d10903ef7d7fd9c2fbb548db
+# Reference https://github.com/2i2c-org/infrastructure/issues/1825
+git+https://github.com/jupyterhub/kubespawner@fa19acdbb056c8d105baab13bbaa2b8b59dfa962