From d5d690c0442d812d61a9d65dbf41411b987c3674 Mon Sep 17 00:00:00 2001 From: Sergey Melnikov Date: Mon, 20 Feb 2023 16:05:21 +0100 Subject: [PATCH] Use fqdn for staging console management API (#3642) `console-staging.local` is legacy manual CNAME to `neon-internal-api.aws.neon.build` in r53 We could use `neon-internal-api.aws.neon.build` name directly --- .github/ansible/staging.eu-west-1.hosts.yaml | 4 ++-- .github/ansible/staging.us-east-2.hosts.yaml | 4 ++-- .github/helm-values/dev-eu-west-1-zeta.neon-proxy-scram.yaml | 4 ++-- .github/helm-values/dev-us-east-2-beta.neon-proxy-link.yaml | 2 +- .../dev-us-east-2-beta.neon-proxy-scram-legacy.yaml | 4 ++-- .github/helm-values/dev-us-east-2-beta.neon-proxy-scram.yaml | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/ansible/staging.eu-west-1.hosts.yaml b/.github/ansible/staging.eu-west-1.hosts.yaml index d19026b3f7..b537795704 100644 --- a/.github/ansible/staging.eu-west-1.hosts.yaml +++ b/.github/ansible/staging.eu-west-1.hosts.yaml @@ -2,11 +2,11 @@ storage: vars: bucket_name: neon-dev-storage-eu-west-1 bucket_region: eu-west-1 - console_mgmt_base_url: http://console-staging.local + console_mgmt_base_url: http://neon-internal-api.aws.neon.build broker_endpoint: http://storage-broker-lb.zeta.eu-west-1.internal.aws.neon.build:50051 pageserver_config_stub: pg_distrib_dir: /usr/local - metric_collection_endpoint: http://console-staging.local/billing/api/v1/usage_events + metric_collection_endpoint: http://neon-internal-api.aws.neon.build/billing/api/v1/usage_events metric_collection_interval: 10min tenant_config: eviction_policy: diff --git a/.github/ansible/staging.us-east-2.hosts.yaml b/.github/ansible/staging.us-east-2.hosts.yaml index a8b9d41a65..cd8f832af0 100644 --- a/.github/ansible/staging.us-east-2.hosts.yaml +++ b/.github/ansible/staging.us-east-2.hosts.yaml @@ -2,11 +2,11 @@ storage: vars: bucket_name: neon-staging-storage-us-east-2 bucket_region: us-east-2 - console_mgmt_base_url: http://console-staging.local + console_mgmt_base_url: http://neon-internal-api.aws.neon.build broker_endpoint: http://storage-broker-lb.beta.us-east-2.internal.aws.neon.build:50051 pageserver_config_stub: pg_distrib_dir: /usr/local - metric_collection_endpoint: http://console-staging.local/billing/api/v1/usage_events + metric_collection_endpoint: http://neon-internal-api.aws.neon.build/billing/api/v1/usage_events metric_collection_interval: 10min tenant_config: eviction_policy: diff --git a/.github/helm-values/dev-eu-west-1-zeta.neon-proxy-scram.yaml b/.github/helm-values/dev-eu-west-1-zeta.neon-proxy-scram.yaml index c49b8d2009..ecf57554d9 100644 --- a/.github/helm-values/dev-eu-west-1-zeta.neon-proxy-scram.yaml +++ b/.github/helm-values/dev-eu-west-1-zeta.neon-proxy-scram.yaml @@ -6,11 +6,11 @@ image: settings: authBackend: "console" - authEndpoint: "http://console-staging.local/management/api/v2" + authEndpoint: "http://neon-internal-api.aws.neon.build/management/api/v2" domain: "*.eu-west-1.aws.neon.build" sentryEnvironment: "staging" wssPort: 8443 - metricCollectionEndpoint: "http://console-staging.local/billing/api/v1/usage_events" + metricCollectionEndpoint: "http://neon-internal-api.aws.neon.build/billing/api/v1/usage_events" metricCollectionInterval: "1min" # -- Additional labels for neon-proxy pods diff --git a/.github/helm-values/dev-us-east-2-beta.neon-proxy-link.yaml b/.github/helm-values/dev-us-east-2-beta.neon-proxy-link.yaml index 157ae66ed1..91ddd07eae 100644 --- a/.github/helm-values/dev-us-east-2-beta.neon-proxy-link.yaml +++ b/.github/helm-values/dev-us-east-2-beta.neon-proxy-link.yaml @@ -10,7 +10,7 @@ settings: uri: "https://console.stage.neon.tech/psql_session/" domain: "pg.neon.build" sentryEnvironment: "staging" - metricCollectionEndpoint: "http://console-staging.local/billing/api/v1/usage_events" + metricCollectionEndpoint: "http://neon-internal-api.aws.neon.build/billing/api/v1/usage_events" metricCollectionInterval: "1min" # -- Additional labels for neon-proxy-link pods diff --git a/.github/helm-values/dev-us-east-2-beta.neon-proxy-scram-legacy.yaml b/.github/helm-values/dev-us-east-2-beta.neon-proxy-scram-legacy.yaml index 99b67d75c1..6ec18ff388 100644 --- a/.github/helm-values/dev-us-east-2-beta.neon-proxy-scram-legacy.yaml +++ b/.github/helm-values/dev-us-east-2-beta.neon-proxy-scram-legacy.yaml @@ -6,11 +6,11 @@ image: settings: authBackend: "console" - authEndpoint: "http://console-staging.local/management/api/v2" + authEndpoint: "http://neon-internal-api.aws.neon.build/management/api/v2" domain: "*.cloud.stage.neon.tech" sentryEnvironment: "staging" wssPort: 8443 - metricCollectionEndpoint: "http://console-staging.local/billing/api/v1/usage_events" + metricCollectionEndpoint: "http://neon-internal-api.aws.neon.build/billing/api/v1/usage_events" metricCollectionInterval: "1min" # -- Additional labels for neon-proxy pods diff --git a/.github/helm-values/dev-us-east-2-beta.neon-proxy-scram.yaml b/.github/helm-values/dev-us-east-2-beta.neon-proxy-scram.yaml index 764bb25b64..9b250fce6e 100644 --- a/.github/helm-values/dev-us-east-2-beta.neon-proxy-scram.yaml +++ b/.github/helm-values/dev-us-east-2-beta.neon-proxy-scram.yaml @@ -6,11 +6,11 @@ image: settings: authBackend: "console" - authEndpoint: "http://console-staging.local/management/api/v2" + authEndpoint: "http://neon-internal-api.aws.neon.build/management/api/v2" domain: "*.us-east-2.aws.neon.build" sentryEnvironment: "staging" wssPort: 8443 - metricCollectionEndpoint: "http://console-staging.local/billing/api/v1/usage_events" + metricCollectionEndpoint: "http://neon-internal-api.aws.neon.build/billing/api/v1/usage_events" metricCollectionInterval: "1min" # -- Additional labels for neon-proxy pods