Merge pull request #3311 from sgibson91/showcase-hub

config/clusters/2i2c-aws-us/cluster.yaml

@@ -26,14 +26,14 @@ hubs:
       - daskhub-common.values.yaml
       - dask-staging.values.yaml
       - enc-dask-staging.secret.values.yaml
-  - name: researchdelight
-    display_name: "2i2c Research Delight"
-    domain: researchdelight.2i2c.cloud
+  - name: showcase
+    display_name: "2i2c Showcase"
+    domain: showcase.2i2c.cloud
     helm_chart: daskhub
     helm_chart_values_files:
       - daskhub-common.values.yaml
-      - researchdelight.values.yaml
-      - enc-researchdelight.secret.values.yaml
+      - showcase.values.yaml
+      - enc-showcase.secret.values.yaml
   - name: ncar-cisl
     display_name: "NCAR-CISL for UCAR"
     domain: ncar-cisl.2i2c.cloud

config/clusters/2i2c-aws-us/enc-showcase.secret.values.yaml

@@ -0,0 +1,21 @@
+basehub:
+    jupyterhub:
+        hub:
+            config:
+                GitHubOAuthenticator:
+                    client_id: ENC[AES256_GCM,data:RDesaa0Wr6pnfklWU0BtoHaWw9g=,iv:C4bBjlkhdM7Xz87/QrEss6QP5ZRb+wPFArDLJCAZ+Ns=,tag:ivt931zOLG1xTsZ694WzKg==,type:str]
+                    client_secret: ENC[AES256_GCM,data:1IGyE4+VKCF6IiHHlCv4hhJLQphz2ax5oEUF4QXjSEQtZGzsU0s10Q==,iv://RLs5scN6NOL/XDmQAPkO+cTcDe2FLkWFS+Uj/+TJs=,tag:d0KTBJOdfdAcR+NFxjVUEA==,type:str]
+sops:
+    kms: []
+    gcp_kms:
+        - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs
+          created_at: "2023-10-24T10:37:44Z"
+          enc: CiUA4OM7eCQWEyht09mKKgbUxNyGoo+QsRZBAI6cVr2XWCEo/dCZEkkAq2nhVakyUtf6neyKXwWWxWPtq6iSLvuhHoswkNlxnuBBVxN1RSFeBEPy8b85Hj0FnSMBy0/tgqEwAbkp7wUz1MYTIbhdzqIo
+    azure_kv: []
+    hc_vault: []
+    age: []
+    lastmodified: "2023-10-24T10:37:44Z"
+    mac: ENC[AES256_GCM,data:g0NOs7Qli/aUO3ZFwCQcFWr+i9tfDnkiyzU8LIDAoaM4BGAzJcRwnjzUO3MfnRjOk4tOS16V1m2eiH8FIWy6sa8kJxJYEO0cU/kKZk+ojCf0txyYE0ZV+gN7w4mb8ZYGP6f4LPwhjy330dkq7uExFaqqLNzDcduWSMAJeBKy2XI=,iv:cZigjUvK0LCwZIBDL+CzOLObBZaiZqJmH+iRoZxPWlk=,tag:Cu3Qgpb2pJD4C4gsUSTNdg==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.7.3

config/clusters/2i2c-aws-us/researchdelight.values.yaml → config/clusters/2i2c-aws-us/showcase.values.yaml

@@ -1,12 +1,15 @@
 basehub:
   userServiceAccount:
     annotations:
+      # When we renamed this hub, we did so at a DNS level and not an infrastructure
+      # level. No terraform config was touched. Hence the kubernetes annotations retain
+      # the original hub name.
       eks.amazonaws.com/role-arn: arn:aws:iam::790657130469:role/2i2c-aws-us-researchdelight
   jupyterhub:
     ingress:
-      hosts: [researchdelight.2i2c.cloud]
+      hosts: [showcase.2i2c.cloud]
       tls:
-        - hosts: [researchdelight.2i2c.cloud]
+        - hosts: [showcase.2i2c.cloud]
           secretName: https-auto-tls
     custom:
       2i2c:
@@ -15,7 +18,7 @@ basehub:
       homepage:
         templateVars:
           org:
-            name: 2i2c Research Delight
+            name: 2i2c Showcase
             url: https://2i2c.org
             logo_url: https://2i2c.org/media/logo.png
           designed_by:
@@ -32,6 +35,7 @@ basehub:
         JupyterHub:
           authenticator_class: github
         GitHubOAuthenticator:
+          oauth_callback_url: "https://showcase.2i2c.cloud/hub/oauth_callback"
           populate_teams_in_auth_state: true
           allowed_organizations:
             - 2i2c-org:research-delight-team

config/clusters/2i2c-aws-us/support.values.yaml

@@ -34,3 +34,8 @@ cluster-autoscaler:
   autoDiscovery:
     clusterName: 2i2c-aws-us
   awsRegion: us-west-2
+
+redirects:
+  rules:
+    - from: researchdelight.2i2c.cloud
+      to: showcase.2i2c.cloud