From dada11fb8147fa824ee6ee7beaaa9d7349a2d422 Mon Sep 17 00:00:00 2001
From: YuviPanda <yuvipanda@gmail.com>
Date: Wed, 27 Dec 2023 15:04:34 -0800
Subject: [PATCH] Bump utoronto staging image again

Brings in https://github.com/2i2c-org/utoronto-image/pull/58,
so we no longer have to use the older notebook server.

Fixes https://github.com/2i2c-org/infrastructure/issues/2380
Ref https://github.com/2i2c-org/infrastructure/issues/2729
---
 config/clusters/utoronto/default-common.values.yaml  | 5 -----
 config/clusters/utoronto/default-prod.values.yaml    | 8 ++++++++
 config/clusters/utoronto/default-staging.values.yaml | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/config/clusters/utoronto/default-common.values.yaml b/config/clusters/utoronto/default-common.values.yaml
index 77e3ad7d5f..d6824dcc8e 100644
--- a/config/clusters/utoronto/default-common.values.yaml
+++ b/config/clusters/utoronto/default-common.values.yaml
@@ -1,10 +1,5 @@
 jupyterhub:
   singleuser:
-    extraEnv:
-      # Required to get jupyter-contrib-nbextensions to work
-      # See https://github.com/2i2c-org/infrastructure/issues/2380
-      # Upstream issue at https://github.com/Jupyter-contrib/jupyter_nbextensions_configurator/issues/153
-      JUPYTERHUB_SINGLEUSER_APP: "notebook.notebookapp.NotebookApp"
     image:
       name: quay.io/2i2c/utoronto-image
       tag: "736072886c54"
diff --git a/config/clusters/utoronto/default-prod.values.yaml b/config/clusters/utoronto/default-prod.values.yaml
index 279893d2a3..3410ca3531 100644
--- a/config/clusters/utoronto/default-prod.values.yaml
+++ b/config/clusters/utoronto/default-prod.values.yaml
@@ -1,4 +1,12 @@
 jupyterhub:
+  singleuser:
+    extraEnv:
+      # Required to get jupyter-contrib-nbextensions to work, until
+      # https://github.com/2i2c-org/utoronto-image/pull/58 can land. An image
+      # including that is already in the staging hub, but not in the prod
+      # hub. This config can be removed when we promote that image to
+      # production.
+      JUPYTERHUB_SINGLEUSER_APP: "notebook.notebookapp.NotebookApp"
   ingress:
     hosts: [jupyter.utoronto.ca]
     tls:
diff --git a/config/clusters/utoronto/default-staging.values.yaml b/config/clusters/utoronto/default-staging.values.yaml
index f64a6a5a57..9c6466b20a 100644
--- a/config/clusters/utoronto/default-staging.values.yaml
+++ b/config/clusters/utoronto/default-staging.values.yaml
@@ -9,7 +9,7 @@ jupyterhub:
       gitRepoBranch: "utoronto-staging"
   singleuser:
     image:
-      tag: "6d72913197bf"
+      tag: "14320bae73a0"
   hub:
     config:
       CILogonOAuthenticator: