From c82007ad027422819cd92d3673a1d16cc482c197 Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Fri, 25 Aug 2023 12:34:21 -0700 Subject: [PATCH 1/7] Move nasa-veda hub URL We keep redirects in place from the old URL, in case there are external links already present. The OAuth callback URL needs to be changed at https://github.com/organizations/2i2c-org/settings/applications/2096065 just before merging. Ref https://github.com/2i2c-org/infrastructure/issues/3029 --- config/clusters/nasa-veda/cluster.yaml | 2 +- config/clusters/nasa-veda/prod.values.yaml | 6 +++--- config/clusters/nasa-veda/support.values.yaml | 7 +++++++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/config/clusters/nasa-veda/cluster.yaml b/config/clusters/nasa-veda/cluster.yaml index edb566599b..f980a41262 100644 --- a/config/clusters/nasa-veda/cluster.yaml +++ b/config/clusters/nasa-veda/cluster.yaml @@ -24,7 +24,7 @@ hubs: - enc-staging.secret.values.yaml - name: prod display_name: "NASA VEDA (prod)" - domain: nasa-veda.2i2c.cloud + domain: veda.2i2c.cloud 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/nasa-veda/prod.values.yaml b/config/clusters/nasa-veda/prod.values.yaml index 92b18b57c4..854559cc0f 100644 --- a/config/clusters/nasa-veda/prod.values.yaml +++ b/config/clusters/nasa-veda/prod.values.yaml @@ -4,11 +4,11 @@ basehub: eks.amazonaws.com/role-arn: arn:aws:iam::444055461661:role/nasa-veda-prod jupyterhub: ingress: - hosts: [nasa-veda.2i2c.cloud] + hosts: [veda.2i2c.cloud] tls: - - hosts: [nasa-veda.2i2c.cloud] + - hosts: [veda.2i2c.cloud] secretName: https-auto-tls hub: config: GitHubOAuthenticator: - oauth_callback_url: https://nasa-veda.2i2c.cloud/hub/oauth_callback + oauth_callback_url: https://veda.2i2c.cloud/hub/oauth_callback diff --git a/config/clusters/nasa-veda/support.values.yaml b/config/clusters/nasa-veda/support.values.yaml index e51536e776..7913edc5e5 100644 --- a/config/clusters/nasa-veda/support.values.yaml +++ b/config/clusters/nasa-veda/support.values.yaml @@ -22,6 +22,13 @@ grafana: hosts: - grafana.nasa-veda.2i2c.cloud +redirects: + rules: + # nasa-veda.2i2c.cloud was the old URL + # Moved due to https://github.com/2i2c-org/infrastructure/issues/3029 + - from: nasa-veda.2i2c.cloud + to: veda.2i2c.cloud + prometheus: server: ingress: From 84219a68f89fb4202dea0a2f752ce1435a010c02 Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Fri, 25 Aug 2023 12:48:00 -0700 Subject: [PATCH 2/7] Add redirect for nasa veda staging hub too --- config/clusters/nasa-veda/support.values.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/clusters/nasa-veda/support.values.yaml b/config/clusters/nasa-veda/support.values.yaml index 7913edc5e5..f14e50b867 100644 --- a/config/clusters/nasa-veda/support.values.yaml +++ b/config/clusters/nasa-veda/support.values.yaml @@ -28,6 +28,8 @@ redirects: # Moved due to https://github.com/2i2c-org/infrastructure/issues/3029 - from: nasa-veda.2i2c.cloud to: veda.2i2c.cloud + - from: staging.nasa-veda.2i2c.cloud + to: staging.veda.2i2c.cloud prometheus: server: From ec58d63b83bd234a7f64f05777b8be67daccc5d4 Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Thu, 30 Nov 2023 12:39:09 -0800 Subject: [PATCH 3/7] Change VEDA URL again --- config/clusters/nasa-veda/staging.values.yaml | 6 +++--- config/clusters/nasa-veda/support.values.yaml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/clusters/nasa-veda/staging.values.yaml b/config/clusters/nasa-veda/staging.values.yaml index bf4b55dfee..222af0e64c 100644 --- a/config/clusters/nasa-veda/staging.values.yaml +++ b/config/clusters/nasa-veda/staging.values.yaml @@ -4,11 +4,11 @@ basehub: eks.amazonaws.com/role-arn: arn:aws:iam::444055461661:role/nasa-veda-staging jupyterhub: ingress: - hosts: [staging.veda.2i2c.cloud] + hosts: [staging.hub.openveda.cloud] tls: - - hosts: [staging.veda.2i2c.cloud] + - hosts: [staging.hub.openveda.cloud] secretName: https-auto-tls hub: config: GitHubOAuthenticator: - oauth_callback_url: https://staging.veda.2i2c.cloud/hub/oauth_callback + oauth_callback_url: https://staging.hub.openveda.cloud/hub/oauth_callback diff --git a/config/clusters/nasa-veda/support.values.yaml b/config/clusters/nasa-veda/support.values.yaml index f14e50b867..f7110b837b 100644 --- a/config/clusters/nasa-veda/support.values.yaml +++ b/config/clusters/nasa-veda/support.values.yaml @@ -27,9 +27,9 @@ redirects: # nasa-veda.2i2c.cloud was the old URL # Moved due to https://github.com/2i2c-org/infrastructure/issues/3029 - from: nasa-veda.2i2c.cloud - to: veda.2i2c.cloud + to: hub.openveda.cloud - from: staging.nasa-veda.2i2c.cloud - to: staging.veda.2i2c.cloud + to: staging.hub.openveda.cloud prometheus: server: From f080f151a3a646525f7f1422ca5ca5c39a2fe583 Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Thu, 30 Nov 2023 12:55:25 -0800 Subject: [PATCH 4/7] Update veda URL --- config/clusters/nasa-veda/prod.values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/clusters/nasa-veda/prod.values.yaml b/config/clusters/nasa-veda/prod.values.yaml index 854559cc0f..930e615799 100644 --- a/config/clusters/nasa-veda/prod.values.yaml +++ b/config/clusters/nasa-veda/prod.values.yaml @@ -4,11 +4,11 @@ basehub: eks.amazonaws.com/role-arn: arn:aws:iam::444055461661:role/nasa-veda-prod jupyterhub: ingress: - hosts: [veda.2i2c.cloud] + hosts: [hub.openveda.cloud] tls: - hosts: [veda.2i2c.cloud] secretName: https-auto-tls hub: config: GitHubOAuthenticator: - oauth_callback_url: https://veda.2i2c.cloud/hub/oauth_callback + oauth_callback_url: https://hub.openveda.cloud/hub/oauth_callback From c53a5566e24466957361b6d1ecb3762ec47daab7 Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Fri, 15 Dec 2023 18:30:23 -0800 Subject: [PATCH 5/7] Rename a couple of missed domains Also remove repetitive comments --- config/clusters/nasa-veda/cluster.yaml | 8 +------- config/clusters/nasa-veda/prod.values.yaml | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/config/clusters/nasa-veda/cluster.yaml b/config/clusters/nasa-veda/cluster.yaml index f980a41262..1f8f862aba 100644 --- a/config/clusters/nasa-veda/cluster.yaml +++ b/config/clusters/nasa-veda/cluster.yaml @@ -16,20 +16,14 @@ hubs: domain: staging.veda.2i2c.cloud helm_chart: daskhub helm_chart_values_files: - # The order in which you list files here is the order the will be passed - # to the helm upgrade command in, and that has meaning. Please check - # that you intend for these files to be applied in this order. - common.values.yaml - staging.values.yaml - enc-staging.secret.values.yaml - name: prod display_name: "NASA VEDA (prod)" - domain: veda.2i2c.cloud + domain: hub.openveda.cloud helm_chart: daskhub helm_chart_values_files: - # The order in which you list files here is the order the will be passed - # to the helm upgrade command in, and that has meaning. Please check - # that you intend for these files to be applied in this order. - common.values.yaml - prod.values.yaml - enc-prod.secret.values.yaml diff --git a/config/clusters/nasa-veda/prod.values.yaml b/config/clusters/nasa-veda/prod.values.yaml index 930e615799..618e9967fb 100644 --- a/config/clusters/nasa-veda/prod.values.yaml +++ b/config/clusters/nasa-veda/prod.values.yaml @@ -6,7 +6,7 @@ basehub: ingress: hosts: [hub.openveda.cloud] tls: - - hosts: [veda.2i2c.cloud] + - hosts: [hub.openveda.cloud] secretName: https-auto-tls hub: config: From c5a37c6c521fe3b3c82e9a216d476a9324622a71 Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Fri, 15 Dec 2023 18:57:25 -0800 Subject: [PATCH 6/7] Remove extra 'redirects' stanza --- config/clusters/nasa-veda/support.values.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/config/clusters/nasa-veda/support.values.yaml b/config/clusters/nasa-veda/support.values.yaml index f7110b837b..8d8320bbf2 100644 --- a/config/clusters/nasa-veda/support.values.yaml +++ b/config/clusters/nasa-veda/support.values.yaml @@ -41,11 +41,3 @@ prometheus: - secretName: prometheus-tls hosts: - prometheus.nasa-veda.2i2c.cloud - -redirects: - rules: - # nasa-veda was previously used in the domain name, but domains including - # nasa that doesn't end in .gov can get blocked so the name was reduced to - # just veda, see https://github.com/2i2c-org/infrastructure/issues/3029 - - from: staging.nasa-veda.2i2c.cloud - to: staging.veda.2i2c.cloud From 67871f25ac706f195cc4b5886bfccd67d1706aed Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Fri, 15 Dec 2023 19:12:53 -0800 Subject: [PATCH 7/7] nasa-veda: Fix missed URL rename Follow-up to https://github.com/2i2c-org/infrastructure/pull/3037 --- config/clusters/nasa-veda/cluster.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/clusters/nasa-veda/cluster.yaml b/config/clusters/nasa-veda/cluster.yaml index 1f8f862aba..d503bfba65 100644 --- a/config/clusters/nasa-veda/cluster.yaml +++ b/config/clusters/nasa-veda/cluster.yaml @@ -13,7 +13,7 @@ support: hubs: - name: staging display_name: "NASA VEDA (staging)" - domain: staging.veda.2i2c.cloud + domain: staging.hub.openveda.cloud helm_chart: daskhub helm_chart_values_files: - common.values.yaml