Merge pull request #3583 from yuvipanda/utoronto-homepage

[Don't merge until Jan 9]Redirect all UToronto home pages to unified homepage

config/clusters/utoronto/common.values.yaml

@@ -20,8 +20,11 @@ jupyterhub:
       enabled: true
   custom:
     homepage:
+      # Everyone hitting the home page directly is redirected to
+      # https://datatools.utoronto.ca as the unified home page. The various parameters
+      # here under templateVars are no-op - UToronto manages the unified homepage themselves.
+      gitRepoBranch: "utoronto"
       templateVars:
-        interface_selector: true
         org:
           name: University of Toronto
           logo_url: https://raw.githubusercontent.com/2i2c-org/default-hub-homepage/utoronto-prod/extra-assets/images/home-hero.png
@@ -35,26 +38,6 @@ jupyterhub:
         funded_by:
           name: University of Toronto
           url: https://www.utoronto.ca/
-        announcements:
-          - |
-            <div>
-              <h4>ARC will be making changes to our educational JupyterHub on January 9, 2023</h4>
-              
-              <p>R/RStudio will be moved off <a href="https://jupyter.utoronto.ca">jupyter.utoronto.ca</a>. R/RStudio will
-              continue to be available through <a href="https://r.datatools.utoronto.ca">r.datatools.utoronto.ca</a> – a
-              separate RStudio hub. To make access to JupyterHub easier than ever, we will also consolidate the landing
-              pages for our Jupyter Notebook and RStudio hubs into a single launch page:
-              <a href="https://datatools.utoronto.ca">datatools.utoronto.ca</a>.</p>
-
-              <p>For more information, please read <a href="https://act.utoronto.ca/jupyterhub-support/updates-to-our-educational-jupyterhub/">our announcement</a>.</p>
-            </div>
-          - |
-            <div>
-              <h4>* NEW * Jupyter Support Website</h4>
-
-              We have started a JupyterHub support website with documentation and tip sheets, and we will be adding more on an
-              ongoing basis. To reach the support site, please visit: <a href="https://act.utoronto.ca/jupyterhub-support">https://act.utoronto.ca/jupyterhub-support/</a>.
-            </div>
   singleuser:
     cpu:
       # Each node has about 8 CPUs total, and if we limit users to no more than

config/clusters/utoronto/default-staging.values.yaml

@@ -4,9 +4,6 @@ jupyterhub:
     tls:
       - hosts: [staging.utoronto.2i2c.cloud]
         secretName: https-auto-tls
-  custom:
-    homepage:
-      gitRepoBranch: "utoronto-staging"
   hub:
     config:
       CILogonOAuthenticator: