From 1c1bb904edc5f7fbd13bc5523d53591759ce93f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lassi=20P=C3=B6l=C3=B6nen?= Date: Thu, 30 Mar 2023 16:24:47 +0300 Subject: [PATCH] Rename zenith_* labels to neon_* (#3911) ## Describe your changes Get rid of the legacy labeling. Aslo `neon_region_slug` with the same value as `neon_region` doesn't make much sense, so just drop it. This allows us to drop the relabeling from zenith to neon in the log collector. --- .../helm-values/dev-eu-west-1-zeta.neon-proxy-scram.yaml | 7 +++---- .../helm-values/dev-us-east-2-beta.neon-proxy-link.yaml | 7 +++---- .../dev-us-east-2-beta.neon-proxy-scram-legacy.yaml | 7 +++---- .../helm-values/dev-us-east-2-beta.neon-proxy-scram.yaml | 7 +++---- .../prod-ap-southeast-1-epsilon.neon-proxy-scram.yaml | 7 +++---- .../prod-eu-central-1-gamma.neon-proxy-scram.yaml | 7 +++---- .../helm-values/prod-us-east-2-delta.neon-proxy-link.yaml | 7 +++---- .../helm-values/prod-us-east-2-delta.neon-proxy-scram.yaml | 7 +++---- .../prod-us-west-2-eta.neon-proxy-scram-legacy.yaml | 7 +++---- .../helm-values/prod-us-west-2-eta.neon-proxy-scram.yaml | 7 +++---- 10 files changed, 30 insertions(+), 40 deletions(-) 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 ad712c4745..2307856464 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 @@ -30,10 +30,9 @@ settings: # -- Additional labels for neon-proxy pods podLabels: - zenith_service: proxy-scram - zenith_env: dev - zenith_region: eu-west-1 - zenith_region_slug: eu-west-1 + neon_service: proxy-scram + neon_env: dev + neon_region: eu-west-1 exposedService: annotations: 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 91ddd07eae..feca05aff6 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 @@ -15,10 +15,9 @@ settings: # -- Additional labels for neon-proxy-link pods podLabels: - zenith_service: proxy - zenith_env: dev - zenith_region: us-east-2 - zenith_region_slug: us-east-2 + neon_service: proxy + neon_env: dev + neon_region: us-east-2 service: type: LoadBalancer 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 6ec18ff388..feee1b369a 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 @@ -15,10 +15,9 @@ settings: # -- Additional labels for neon-proxy pods podLabels: - zenith_service: proxy-scram-legacy - zenith_env: dev - zenith_region: us-east-2 - zenith_region_slug: us-east-2 + neon_service: proxy-scram-legacy + neon_env: dev + neon_region: us-east-2 exposedService: annotations: 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 a091be1016..40814e55c9 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 @@ -30,10 +30,9 @@ settings: # -- Additional labels for neon-proxy pods podLabels: - zenith_service: proxy-scram - zenith_env: dev - zenith_region: us-east-2 - zenith_region_slug: us-east-2 + neon_service: proxy-scram + neon_env: dev + neon_region: us-east-2 exposedService: annotations: diff --git a/.github/helm-values/prod-ap-southeast-1-epsilon.neon-proxy-scram.yaml b/.github/helm-values/prod-ap-southeast-1-epsilon.neon-proxy-scram.yaml index 8d65e94d00..aa5be89101 100644 --- a/.github/helm-values/prod-ap-southeast-1-epsilon.neon-proxy-scram.yaml +++ b/.github/helm-values/prod-ap-southeast-1-epsilon.neon-proxy-scram.yaml @@ -31,10 +31,9 @@ settings: # -- Additional labels for neon-proxy pods podLabels: - zenith_service: proxy-scram - zenith_env: prod - zenith_region: ap-southeast-1 - zenith_region_slug: ap-southeast-1 + neon_service: proxy-scram + neon_env: prod + neon_region: ap-southeast-1 exposedService: annotations: diff --git a/.github/helm-values/prod-eu-central-1-gamma.neon-proxy-scram.yaml b/.github/helm-values/prod-eu-central-1-gamma.neon-proxy-scram.yaml index f806b37482..083af6aa2d 100644 --- a/.github/helm-values/prod-eu-central-1-gamma.neon-proxy-scram.yaml +++ b/.github/helm-values/prod-eu-central-1-gamma.neon-proxy-scram.yaml @@ -31,10 +31,9 @@ settings: # -- Additional labels for neon-proxy pods podLabels: - zenith_service: proxy-scram - zenith_env: prod - zenith_region: eu-central-1 - zenith_region_slug: eu-central-1 + neon_service: proxy-scram + neon_env: prod + neon_region: eu-central-1 exposedService: annotations: diff --git a/.github/helm-values/prod-us-east-2-delta.neon-proxy-link.yaml b/.github/helm-values/prod-us-east-2-delta.neon-proxy-link.yaml index eff24302bb..30dcefc151 100644 --- a/.github/helm-values/prod-us-east-2-delta.neon-proxy-link.yaml +++ b/.github/helm-values/prod-us-east-2-delta.neon-proxy-link.yaml @@ -13,10 +13,9 @@ settings: # -- Additional labels for zenith-proxy pods podLabels: - zenith_service: proxy - zenith_env: production - zenith_region: us-east-2 - zenith_region_slug: us-east-2 + neon_service: proxy + neon_env: production + neon_region: us-east-2 service: type: LoadBalancer diff --git a/.github/helm-values/prod-us-east-2-delta.neon-proxy-scram.yaml b/.github/helm-values/prod-us-east-2-delta.neon-proxy-scram.yaml index 38719f64e7..40fbc52b39 100644 --- a/.github/helm-values/prod-us-east-2-delta.neon-proxy-scram.yaml +++ b/.github/helm-values/prod-us-east-2-delta.neon-proxy-scram.yaml @@ -31,10 +31,9 @@ settings: # -- Additional labels for neon-proxy pods podLabels: - zenith_service: proxy-scram - zenith_env: prod - zenith_region: us-east-2 - zenith_region_slug: us-east-2 + neon_service: proxy-scram + neon_env: prod + neon_region: us-east-2 exposedService: annotations: diff --git a/.github/helm-values/prod-us-west-2-eta.neon-proxy-scram-legacy.yaml b/.github/helm-values/prod-us-west-2-eta.neon-proxy-scram-legacy.yaml index d23ea41bd7..a186fb833f 100644 --- a/.github/helm-values/prod-us-west-2-eta.neon-proxy-scram-legacy.yaml +++ b/.github/helm-values/prod-us-west-2-eta.neon-proxy-scram-legacy.yaml @@ -31,10 +31,9 @@ settings: # -- Additional labels for neon-proxy pods podLabels: - zenith_service: proxy-scram - zenith_env: prod - zenith_region: us-west-2 - zenith_region_slug: us-west-2 + neon_service: proxy-scram + neon_env: prod + neon_region: us-west-2 exposedService: annotations: diff --git a/.github/helm-values/prod-us-west-2-eta.neon-proxy-scram.yaml b/.github/helm-values/prod-us-west-2-eta.neon-proxy-scram.yaml index d5a7d6d575..810a6a5f78 100644 --- a/.github/helm-values/prod-us-west-2-eta.neon-proxy-scram.yaml +++ b/.github/helm-values/prod-us-west-2-eta.neon-proxy-scram.yaml @@ -31,10 +31,9 @@ settings: # -- Additional labels for neon-proxy pods podLabels: - zenith_service: proxy-scram - zenith_env: prod - zenith_region: us-west-2 - zenith_region_slug: us-west-2 + neon_service: proxy-scram + neon_env: prod + neon_region: us-west-2 exposedService: annotations: