Merge pull request #3680 from yuvipanda/es-domains

Point earthscope hubs to community provided domains

config/clusters/earthscope/cluster.yaml

@@ -12,15 +12,15 @@ support:
 hubs:
   - name: staging
     display_name: "EarthScope (staging)"
-    domain: staging.earthscope.2i2c.cloud
+    domain: staging.geolab.earthscope.cloud
     helm_chart: daskhub
     helm_chart_values_files:
       - common.values.yaml
       - staging.values.yaml
       - enc-staging.secret.values.yaml
   - name: prod
     display_name: "EarthScope (prod)"
-    domain: earthscope.2i2c.cloud
+    domain: geolab.earthscope.cloud
     helm_chart: daskhub
     helm_chart_values_files:
       - common.values.yaml

config/clusters/earthscope/enc-prod.secret.values.yaml

@@ -3,22 +3,19 @@ basehub:
         hub:
             config:
                 Auth0OAuthenticator:
-                    client_id: ENC[AES256_GCM,data:DwOUn4AFZyJrPv2gw3SvArLXNrEOQgoWJPYLpJSQetE=,iv:HFevqec5FROZQkAfCnkoVZacFhVsRB2Fym82XHDzFBw=,tag:O9it7h27UX7a89sExeXs9A==,type:str]
-                    client_secret: ENC[AES256_GCM,data:fQdBLKrl9OG1zB9wX0+j10K+1+rgSTz1/v/tVOcV8ZZcXM8FCs9EKR2nhvfrMHL3nX59NMUeI64Jb9EG16mE5g==,iv:JfSBDbzia4xNSWPmW3Cde8RqUg78l6t34yviXx54VXU=,tag:9ID3wzmWvZa1hbfsT2rTyw==,type:str]
-                CILogonOAuthenticator:
-                    client_id: ENC[AES256_GCM,data:1C0ercYZjjc63vTPPcVa7B0Y1bnuawg854Yf3Kl4UnJ0gYuqem+zuv1lQfOzU8zKXy5L,iv:2IZjb7WzomJg8I9uDDXINjULJPXUBfJCldMOxH+B8tA=,tag:Dv1xaVkDCpI7/GLuGv6GzA==,type:str]
-                    client_secret: ENC[AES256_GCM,data:2mGbTTnKcVZp57ZX2Tj2o+j2y0NfABPtTiV6sw3oWlR/t7w4fiFkSK9cyArnJwQfRjWc6M6NNB50A3zWZrKaoPLRj8Afiq8pFTjtRZnZGe5g4h2mXYg=,iv:xmJEHc2V0aG1KEh2eAPj80tZoNzFnBz42QdCSmzO2mc=,tag:+48SuYVdlJCizaYVMn9hrA==,type:str]
+                    client_id: ENC[AES256_GCM,data:qn8Xel6vzFKHuL7gP8aGKQr3C7AGORQ7sCyNvKulbDE=,iv:bWYt/w31HcaEDjUBW3DZv/Lb4Ny/BPEjoBTsjp0XP6g=,tag:/02E1lYfhfOMcd+P2+DV8Q==,type:str]
+                    client_secret: ENC[AES256_GCM,data:qry2vIkYLTRd7rlg6RTO6pB+e4SP5mvzClqagyJbbzXYkdeiGQccVFsERQ15RT/BRDX/PX4Bj5ZxcuCY9wGsxw==,iv:k763ow53AuqWG7dSyqkaosa9O4NwufRnmmORRxssGQA=,tag:MX4zqeOS3vdxhhYUljipJA==,type:str]
 sops:
     kms: []
     gcp_kms:
         - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs
-          created_at: "2023-12-14T18:24:33Z"
-          enc: CiUA4OM7eKr6IJS10QOinx3kZfdMUdO4HmyV6U+JIe+s7IqTAm1DEkkAjTWv+ifsDVRYeh6Gdg0+tLE53DfZfJP0xHGuo6yxdoREE2FGKpodr42/SaaTUt2k5zKlg6k9tOe4FgmRGCT5JjIltibg5hwU
+          created_at: "2024-02-01T19:48:36Z"
+          enc: CiUA4OM7eNqlXnXuPafjk2mTtwiF9Rj9YkZ3urDKx4qdhKBpmS6bEkkAjTWv+vVCb2ruGuWZED5P/YZ637VqREwUreI3ycHvsSoaAEXe8CSUZBQ+0FIi4x9xKnpnLEF9JNcwaME2Fr9iwURYVJhoDk89
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2024-01-24T22:53:57Z"
-    mac: ENC[AES256_GCM,data:MgnyRZmQryZqw+0gy3yUp3syuIYsWi3vvkOQrjW4jkk3/ZfIjWyo81cnO3Jgxr2pAADAbqX4qKITpBuWpX05lEDhv3kg3L6DAhnY0iExuDSWHGYJ04856pADGtuHIFIYmQxG46u+RfpTljVZK4cHAY4OVUraHVbKVxg/iP5pkpU=,iv:XF43toaqgiGjUh0W3HG0Iq2Y10paP24BGnPk9HomLKk=,tag:bsp93INUlVt1WJA4h7uVLw==,type:str]
+    lastmodified: "2024-02-01T19:48:36Z"
+    mac: ENC[AES256_GCM,data:Cw3rTUGqQlymWXXu/Z7qLSAIlULn5B3SAPxbzkeBDCFSO8u4fhuZXEjoEBvFFdujdEtU9Q7bASKRyl4aveZDJ+aZHboKNDV77d7atONojcEFj/DIy2ELQriMwyq1hx5hZS/onGgt8XLmcjXDJdMH6zEZOYrZl93uTuoS+Qt+4GI=,iv:oCWMr+17mgo+P1btrLglokBO3yYZ9JpZBTx36Vhtb3s=,tag:GEN4T0/9KQzz4+oTxvhbBQ==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
-    version: 3.8.1
+    version: 3.7.3

config/clusters/earthscope/enc-staging.secret.values.yaml

@@ -3,22 +3,19 @@ basehub:
         hub:
             config:
                 Auth0OAuthenticator:
-                    client_id: ENC[AES256_GCM,data:zAZAcTnDoYXd6+HEHyCTAZcWDfFb4MVGaHguf+l80jc=,iv:aQidh2IJMcMcEPBCyB7I94of0ywyvNNc4R/9jrTh/Xo=,tag:EN3jpNVKALN4L5mBw21Ptg==,type:str]
-                    client_secret: ENC[AES256_GCM,data:glfuw+S6w1n8hNOvYlEPvTVU6yfAePNt1/zzz8ttrW8eTro5o05dKLeUgULp75/tk5BbVoYkjt3VsruVWq5nWg==,iv:GtB9642/chhguJaLsvI/It1kGWH/VZ5J/ubdbu5GzvY=,tag:Ym62f23AnqPDEFTDC9RwAA==,type:str]
-                CILogonOAuthenticator:
-                    client_id: ENC[AES256_GCM,data:Lv/25K0A8CZs6dK20mujkn536hpreimP/MUqGOJ4cpXLTFnJNRmGkN7mYPC2klalEKcn,iv:nj4b7Y75A9wgg+w2XBas17Cs8Az3AzDkeO9u1ZwI1Jo=,tag:gCMMoa3iQWVRQvTQkCIkAg==,type:str]
-                    client_secret: ENC[AES256_GCM,data:EAD3iQGXs7soD4VxRXol2YuuJBmOpDBbX5Cg+VyTk7xA7Jn715vZMNBeOKtal1a6kzyds3tuw+h+DWsF3Dod2MxHS7H4FARHLopP9xuAvS6Tw3mZZ28=,iv:F8CqwLYz7WR5qge0Yj91aU/w5pj6fiEaBvndVe4zvG4=,tag:60BekNlkRhf2a3Nkvo1kWg==,type:str]
+                    client_id: ENC[AES256_GCM,data:urLrYypX6IUSVpqFAumEAi9aGJKyQv8oQuNqw5HNhKo=,iv:sQcq2R5wbS2P00nygxPQ3p2LdAsxkRQrk4jvnMWAjQg=,tag:eosLpXx6vWQMNjIxDcsC7Q==,type:str]
+                    client_secret: ENC[AES256_GCM,data:PrphM7gVSfUOInO008VgfhNU4r1+I4oLRT+ypJv5848Bvy1nN+ARzTrPgu7Q3KIiCaXyfNd3Xv6ieb0lsKCLZw==,iv:Vnbo4jG0sARtOL28GxgGAKKITQb5Tx6/TNscWUNgkJU=,tag:RgxhqVzdfsmwMTTEMCn2Zw==,type:str]
 sops:
     kms: []
     gcp_kms:
         - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs
-          created_at: "2023-12-14T18:42:48Z"
-          enc: CiUA4OM7eGqP+F9UNcdWkWcEANT1YIeSiFyzogRgfD+PMhJISk+lEkkAjTWv+sk2C+z/gAjXwaTvoJEJKeuCyiegMLu8QTkJ1KCtcQEU52qv/gm6HvBAlQAnTUKxpQFejxzGOp/8+FNCZiAuaT2hHq1D
+          created_at: "2024-02-01T19:48:31Z"
+          enc: CiUA4OM7eAKAiiSfQuUB7nTB5A/zSI/P16GJHnWqh+mnJDX9kseyEkkAjTWv+rx43jKyWwvhoDQeXbLRa9yx50aBn+OWolR8xigR8gbbApOBQScDu7lkReRftbVRCi06PU1l4TbDVM3Jqdk8+VJdGhaC
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2024-01-24T23:03:04Z"
-    mac: ENC[AES256_GCM,data:ZPZmbQLCeuK1C7FR8USNXtJiE8xV6esOt4tcqSRuwe73HxAyogAstYBqDz5rlsi5qf68ew6dLkhX17oiJxABTCi4PpNMMktuVGe10OrlAEgZm4cRc3H4MfdMEfS/2I7V0PcItJINqte0EGQbYqRYgkz5XCA4+0k8075uIqypoug=,iv:uzeiyu9hP6mo7YphNJU/AZOquKU055IxznWiDXrETrA=,tag:qwDi7EleXQaYHagsXS7jzA==,type:str]
+    lastmodified: "2024-02-01T19:48:31Z"
+    mac: ENC[AES256_GCM,data:ZYVgv+u0FD+jxYtgyITNLXr5bHNEEkkXtTM0SJGv8txbAVM4yt1k9CF95iVevPsRGG2yztY5vTDQaFGeg0tLGmG55fuuliZhMrB9RsDkmM3qEibVgQQTQZI5ZUciWHSBGm/NCMKnj6ujIx0h3E3cjtZBESIpONH+66kbuGhAlMo=,iv:ORwgid7PCff05bxWN9FuWNCN+wLY+bVZi0GfGDZwQj4=,tag:O+Bkh0UbeDzmAvYWJ5PpKQ==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
-    version: 3.8.1
+    version: 3.7.3

config/clusters/earthscope/prod.values.yaml

@@ -1,9 +1,9 @@
 basehub:
   jupyterhub:
     ingress:
-      hosts: [earthscope.2i2c.cloud]
+      hosts: [geolab.earthscope.cloud]
       tls:
-        - hosts: [earthscope.2i2c.cloud]
+        - hosts: [geolab.earthscope.cloud]
           secretName: https-auto-tls
     custom:
       homepage:
@@ -13,11 +13,9 @@ basehub:
     hub:
       config:
         CustomAuth0OAuthenticator:
-          logout_redirect_to_url: https://earthscope.2i2c.cloud
+          logout_redirect_to_url: https://geolab.earthscope.cloud
         Auth0OAuthenticator:
           auth0_domain: login.earthscope.org
           extra_authorize_params:
             # This isn't an actual URL, just a string. Must not have a trailing slash
             audience: https://api.earthscope.org
-        CILogonOAuthenticator:
-          oauth_callback_url: https://earthscope.2i2c.cloud/hub/oauth_callback

config/clusters/earthscope/staging.values.yaml

@@ -1,9 +1,10 @@
 basehub:
   jupyterhub:
     ingress:
-      hosts: [staging.earthscope.2i2c.cloud]
+      hosts:
+        - staging.geolab.earthscope.cloud
       tls:
-        - hosts: [staging.earthscope.2i2c.cloud]
+        - hosts: [staging.geolab.earthscope.cloud]
           secretName: https-auto-tls
     custom:
       homepage:
@@ -13,11 +14,9 @@ basehub:
     hub:
       config:
         CustomAuth0OAuthenticator:
-          logout_redirect_to_url: https://staging.earthscope.2i2c.cloud
+          logout_redirect_to_url: https://staging.geolab.earthscope.cloud
         Auth0OAuthenticator:
           auth0_domain: login-dev.earthscope.org
           extra_authorize_params:
             # This isn't an actual URL, just a string. Must not have a trailing slash
             audience: https://api.dev.earthscope.org
-        CILogonOAuthenticator:
-          oauth_callback_url: https://staging.earthscope.2i2c.cloud/hub/oauth_callback

config/clusters/earthscope/support.values.yaml

@@ -1,6 +1,13 @@
 prometheusIngressAuthSecret:
   enabled: true
 
+redirects:
+  rules:
+    - from: staging.earthscope.2i2c.cloud
+      to: staging.geolab.earthscope.cloud
+    - from: earthscope.2i2c.cloud
+      to: geolab.earthscope.cloud
+
 prometheus:
   server:
     ingress: