[pull] main from 2i2c-org:main

.pre-commit-config.yaml

@@ -31,7 +31,7 @@ repos:
 
   # Autoformat: Python code
   - repo: https://github.com/psf/black
-    rev: "24.8.0"
+    rev: "24.10.0"
     hooks:
       - id: black
         # This is a `.py` file but is encrypted with sops

config/clusters/2i2c/ohw.values.yaml

@@ -35,7 +35,7 @@ basehub:
         - display_name: "R en RStudio"
           description: "~2 CPU, ~8G RAM"
           kubespawner_override:
-            image: "ghcr.io/oceanhackweek/r:37f83fb"
+            image: "ghcr.io/oceanhackweek/r:9767746"
             default_url: "/rstudio"
             mem_limit: 8G
             mem_guarantee: 4G
@@ -66,8 +66,8 @@ basehub:
             name: 2i2c
             url: https://2i2c.org
           funded_by:
-            name: AECID
-            url: https://www.aecid.es
+            name: CSIC
+            url: https://www.csic.es/es
     hub:
       config:
         JupyterHub:

config/clusters/nasa-cryo/common.values.yaml

@@ -220,13 +220,6 @@ basehub:
             # Per https://2i2c.freshdesk.com/a/tickets/1537
             image: openscapes/matlab:latest
           profile_options: *profile_options
-        - display_name: PACE Hackweek 2024
-          slug: pace-2024
-          description: Environment for the PACE Hackweek
-          kubespawner_override:
-            # Per https://2i2c.freshdesk.com/a/tickets/1952
-            image: quay.io/pacehackweek/pace-2024:latest
-          profile_options: *profile_options
         - display_name: "Bring your own image"
           description: Specify your own docker image (must have python and jupyterhub installed in it)
           slug: custom

config/clusters/victor/cluster.yaml

@@ -14,7 +14,7 @@ support:
 hubs:
   - name: staging
     display_name: "Victor (staging)"
-    domain: staging.victor.2i2c.cloud
+    domain: staging.hub.victorproject.org
     helm_chart: daskhub
     helm_chart_values_files:
       # The order in which you list files here is the order the will be passed
@@ -25,7 +25,7 @@ hubs:
       - enc-staging.secret.values.yaml
   - name: prod
     display_name: "Victor"
-    domain: victor.2i2c.cloud
+    domain: hub.victorproject.org
     helm_chart: daskhub
     helm_chart_values_files:
       # The order in which you list files here is the order the will be passed

config/clusters/victor/prod.values.yaml

@@ -5,14 +5,14 @@ basehub:
 
   jupyterhub:
     ingress:
-      hosts: [victor.2i2c.cloud]
+      hosts: [hub.victorproject.org]
       tls:
-        - hosts: [victor.2i2c.cloud]
+        - hosts: [hub.victorproject.org]
           secretName: https-auto-tls
     hub:
       config:
         GitHubOAuthenticator:
-          oauth_callback_url: https://victor.2i2c.cloud/hub/oauth_callback
+          oauth_callback_url: https://hub.victorproject.org/hub/oauth_callback
     singleuser:
       profileList:
         # IMPORTANT: Staging and prod's profileList's are meant to be kept

config/clusters/victor/staging.values.yaml

@@ -5,14 +5,14 @@ basehub:
 
   jupyterhub:
     ingress:
-      hosts: [staging.victor.2i2c.cloud]
+      hosts: [staging.hub.victorproject.org]
       tls:
-        - hosts: [staging.victor.2i2c.cloud]
+        - hosts: [staging.hub.victorproject.org]
           secretName: https-auto-tls
     hub:
       config:
         GitHubOAuthenticator:
-          oauth_callback_url: https://staging.victor.2i2c.cloud/hub/oauth_callback
+          oauth_callback_url: https://staging.hub.victorproject.org/hub/oauth_callback
     singleuser:
       profileList:
         # IMPORTANT: Staging and prod's profileList's are meant to be kept

config/clusters/victor/support.values.yaml

@@ -32,3 +32,10 @@ prometheus:
         - secretName: prometheus-tls
           hosts:
             - prometheus.victor.2i2c.cloud
+
+redirects:
+  rules:
+    - from: victor.2i2c.cloud
+      to: hub.victorproject.org
+    - from: staging.victor.2i2c.cloud
+      to: staging.hub.victorproject.org