From e970ef61dbc77bbb065df8405cfcac8fb7daaf21 Mon Sep 17 00:00:00 2001
From: Erik Sundell <erik@sundellopensource.se>
Date: Tue, 8 Oct 2024 14:18:31 +0200
Subject: [PATCH] victor: update to use community provided domain

---
 config/clusters/victor/cluster.yaml        | 4 ++--
 config/clusters/victor/prod.values.yaml    | 6 +++---
 config/clusters/victor/staging.values.yaml | 6 +++---
 config/clusters/victor/support.values.yaml | 7 +++++++
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/config/clusters/victor/cluster.yaml b/config/clusters/victor/cluster.yaml
index 5ee56d575..4a64b883f 100644
--- a/config/clusters/victor/cluster.yaml
+++ b/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
diff --git a/config/clusters/victor/prod.values.yaml b/config/clusters/victor/prod.values.yaml
index f278cc3d2..bbce3fff0 100644
--- a/config/clusters/victor/prod.values.yaml
+++ b/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
diff --git a/config/clusters/victor/staging.values.yaml b/config/clusters/victor/staging.values.yaml
index 3d4ad80f1..0223f9a37 100644
--- a/config/clusters/victor/staging.values.yaml
+++ b/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
diff --git a/config/clusters/victor/support.values.yaml b/config/clusters/victor/support.values.yaml
index e3a50e285..246a0e7f0 100644
--- a/config/clusters/victor/support.values.yaml
+++ b/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