From ff1e8def3dc76d158aae8b42429ea127a276dd76 Mon Sep 17 00:00:00 2001 From: stxkxs Date: Sun, 7 Jun 2026 16:45:23 -0700 Subject: [PATCH] refactor(azure): standardize the live env token on `production` (was `prod`) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `production` is the org-wide environment token — the AWS and GCP live trees, eks-gitops, kx, the tenant charts, eks-agent-platform, and eks-fleet all use it. The Azure live tree was the lone holdout on the short `prod`, which contradicted the multi-cloud parity the stack is built around and broke aks-gitops' "mirrors eks-gitops" contract. - Renamed the env directory `live/azure/workload-prod/westus2/prod` → `…/production` (the `workload-prod` subscription/account alias is kept, exactly as AWS pairs a `workload-prod` account with a `production` env). - `env.hcl`: `environment = "prod"` → `"production"`. This value is the cluster's `environment` secret label and feeds `resource_group_name` (so the RG, the `…-aks` cluster name, and every env-derived Azure resource name standardize with it). - Updated the shared `_envcommon/azure/*.hcl` cluster mock_outputs from the stale `mock.oic.prod-aks.azure.com` placeholder to `production-aks`. Pairs with aks-gitops standardizing its env token (so AKS clusters get labeled `environment: production` and the gitops `values-production.yaml` / `overlays/production` resolve). Renaming the env token shifts the Azure tfstate path key `tfstate/prod/…` → `tfstate/production/…`; any previously-applied Azure prod state re-applies under the new key. --- live/_envcommon/azure/cluster-addons.hcl | 2 +- live/_envcommon/azure/druid-catalog.hcl | 2 +- live/_envcommon/azure/managed-monitoring.hcl | 2 +- live/_envcommon/azure/secrets.hcl | 2 +- .../westus2/{prod => production}/backup/terragrunt.hcl | 0 .../westus2/{prod => production}/break-glass/terragrunt.hcl | 0 .../westus2/{prod => production}/cluster-addons/terragrunt.hcl | 0 .../{prod => production}/cluster-bootstrap/terragrunt.hcl | 0 .../westus2/{prod => production}/cluster/terragrunt.hcl | 0 .../westus2/{prod => production}/cost/terragrunt.hcl | 0 .../westus2/{prod => production}/dns/terragrunt.hcl | 0 .../{prod => production}/druid-catalog-analytics/terragrunt.hcl | 0 live/azure/workload-prod/westus2/{prod => production}/env.hcl | 2 +- .../{prod => production}/managed-monitoring/terragrunt.hcl | 0 .../westus2/{prod => production}/network/terragrunt.hcl | 0 .../westus2/{prod => production}/observability/terragrunt.hcl | 0 .../westus2/{prod => production}/secrets/terragrunt.hcl | 0 .../westus2/{prod => production}/service-quotas/terragrunt.hcl | 0 18 files changed, 5 insertions(+), 5 deletions(-) rename live/azure/workload-prod/westus2/{prod => production}/backup/terragrunt.hcl (100%) rename live/azure/workload-prod/westus2/{prod => production}/break-glass/terragrunt.hcl (100%) rename live/azure/workload-prod/westus2/{prod => production}/cluster-addons/terragrunt.hcl (100%) rename live/azure/workload-prod/westus2/{prod => production}/cluster-bootstrap/terragrunt.hcl (100%) rename live/azure/workload-prod/westus2/{prod => production}/cluster/terragrunt.hcl (100%) rename live/azure/workload-prod/westus2/{prod => production}/cost/terragrunt.hcl (100%) rename live/azure/workload-prod/westus2/{prod => production}/dns/terragrunt.hcl (100%) rename live/azure/workload-prod/westus2/{prod => production}/druid-catalog-analytics/terragrunt.hcl (100%) rename live/azure/workload-prod/westus2/{prod => production}/env.hcl (85%) rename live/azure/workload-prod/westus2/{prod => production}/managed-monitoring/terragrunt.hcl (100%) rename live/azure/workload-prod/westus2/{prod => production}/network/terragrunt.hcl (100%) rename live/azure/workload-prod/westus2/{prod => production}/observability/terragrunt.hcl (100%) rename live/azure/workload-prod/westus2/{prod => production}/secrets/terragrunt.hcl (100%) rename live/azure/workload-prod/westus2/{prod => production}/service-quotas/terragrunt.hcl (100%) diff --git a/live/_envcommon/azure/cluster-addons.hcl b/live/_envcommon/azure/cluster-addons.hcl index 2b7252f..aa99695 100644 --- a/live/_envcommon/azure/cluster-addons.hcl +++ b/live/_envcommon/azure/cluster-addons.hcl @@ -15,7 +15,7 @@ dependency "cluster" { config_path = "../cluster" mock_outputs = { cluster_name = "mock-aks" - oidc_issuer_url = "https://mock.oic.prod-aks.azure.com/mock" + oidc_issuer_url = "https://mock.oic.production-aks.azure.com/mock" } } diff --git a/live/_envcommon/azure/druid-catalog.hcl b/live/_envcommon/azure/druid-catalog.hcl index 7f5be25..a5c441e 100644 --- a/live/_envcommon/azure/druid-catalog.hcl +++ b/live/_envcommon/azure/druid-catalog.hcl @@ -15,7 +15,7 @@ dependency "cluster" { config_path = "../cluster" mock_outputs = { cluster_name = "mock-aks" - oidc_issuer_url = "https://mock.oic.prod-aks.azure.com/mock" + oidc_issuer_url = "https://mock.oic.production-aks.azure.com/mock" } } diff --git a/live/_envcommon/azure/managed-monitoring.hcl b/live/_envcommon/azure/managed-monitoring.hcl index 17af287..ed9d79f 100644 --- a/live/_envcommon/azure/managed-monitoring.hcl +++ b/live/_envcommon/azure/managed-monitoring.hcl @@ -18,7 +18,7 @@ dependency "cluster" { config_path = "../cluster" mock_outputs = { cluster_name = "mock-aks" - oidc_issuer_url = "https://mock.oic.prod-aks.azure.com/mock" + oidc_issuer_url = "https://mock.oic.production-aks.azure.com/mock" } } diff --git a/live/_envcommon/azure/secrets.hcl b/live/_envcommon/azure/secrets.hcl index 609e55d..950fce5 100644 --- a/live/_envcommon/azure/secrets.hcl +++ b/live/_envcommon/azure/secrets.hcl @@ -20,7 +20,7 @@ locals { dependency "cluster" { config_path = "../cluster" mock_outputs = { - oidc_issuer_url = "https://mock.oic.prod-aks.azure.com/mock" + oidc_issuer_url = "https://mock.oic.production-aks.azure.com/mock" } } diff --git a/live/azure/workload-prod/westus2/prod/backup/terragrunt.hcl b/live/azure/workload-prod/westus2/production/backup/terragrunt.hcl similarity index 100% rename from live/azure/workload-prod/westus2/prod/backup/terragrunt.hcl rename to live/azure/workload-prod/westus2/production/backup/terragrunt.hcl diff --git a/live/azure/workload-prod/westus2/prod/break-glass/terragrunt.hcl b/live/azure/workload-prod/westus2/production/break-glass/terragrunt.hcl similarity index 100% rename from live/azure/workload-prod/westus2/prod/break-glass/terragrunt.hcl rename to live/azure/workload-prod/westus2/production/break-glass/terragrunt.hcl diff --git a/live/azure/workload-prod/westus2/prod/cluster-addons/terragrunt.hcl b/live/azure/workload-prod/westus2/production/cluster-addons/terragrunt.hcl similarity index 100% rename from live/azure/workload-prod/westus2/prod/cluster-addons/terragrunt.hcl rename to live/azure/workload-prod/westus2/production/cluster-addons/terragrunt.hcl diff --git a/live/azure/workload-prod/westus2/prod/cluster-bootstrap/terragrunt.hcl b/live/azure/workload-prod/westus2/production/cluster-bootstrap/terragrunt.hcl similarity index 100% rename from live/azure/workload-prod/westus2/prod/cluster-bootstrap/terragrunt.hcl rename to live/azure/workload-prod/westus2/production/cluster-bootstrap/terragrunt.hcl diff --git a/live/azure/workload-prod/westus2/prod/cluster/terragrunt.hcl b/live/azure/workload-prod/westus2/production/cluster/terragrunt.hcl similarity index 100% rename from live/azure/workload-prod/westus2/prod/cluster/terragrunt.hcl rename to live/azure/workload-prod/westus2/production/cluster/terragrunt.hcl diff --git a/live/azure/workload-prod/westus2/prod/cost/terragrunt.hcl b/live/azure/workload-prod/westus2/production/cost/terragrunt.hcl similarity index 100% rename from live/azure/workload-prod/westus2/prod/cost/terragrunt.hcl rename to live/azure/workload-prod/westus2/production/cost/terragrunt.hcl diff --git a/live/azure/workload-prod/westus2/prod/dns/terragrunt.hcl b/live/azure/workload-prod/westus2/production/dns/terragrunt.hcl similarity index 100% rename from live/azure/workload-prod/westus2/prod/dns/terragrunt.hcl rename to live/azure/workload-prod/westus2/production/dns/terragrunt.hcl diff --git a/live/azure/workload-prod/westus2/prod/druid-catalog-analytics/terragrunt.hcl b/live/azure/workload-prod/westus2/production/druid-catalog-analytics/terragrunt.hcl similarity index 100% rename from live/azure/workload-prod/westus2/prod/druid-catalog-analytics/terragrunt.hcl rename to live/azure/workload-prod/westus2/production/druid-catalog-analytics/terragrunt.hcl diff --git a/live/azure/workload-prod/westus2/prod/env.hcl b/live/azure/workload-prod/westus2/production/env.hcl similarity index 85% rename from live/azure/workload-prod/westus2/prod/env.hcl rename to live/azure/workload-prod/westus2/production/env.hcl index de79b3e..a1ec1dc 100644 --- a/live/azure/workload-prod/westus2/prod/env.hcl +++ b/live/azure/workload-prod/westus2/production/env.hcl @@ -1,5 +1,5 @@ locals { - environment = "prod" + environment = "production" cost_center = "platform-engineering" business_unit = "engineering" data_classification = "confidential" diff --git a/live/azure/workload-prod/westus2/prod/managed-monitoring/terragrunt.hcl b/live/azure/workload-prod/westus2/production/managed-monitoring/terragrunt.hcl similarity index 100% rename from live/azure/workload-prod/westus2/prod/managed-monitoring/terragrunt.hcl rename to live/azure/workload-prod/westus2/production/managed-monitoring/terragrunt.hcl diff --git a/live/azure/workload-prod/westus2/prod/network/terragrunt.hcl b/live/azure/workload-prod/westus2/production/network/terragrunt.hcl similarity index 100% rename from live/azure/workload-prod/westus2/prod/network/terragrunt.hcl rename to live/azure/workload-prod/westus2/production/network/terragrunt.hcl diff --git a/live/azure/workload-prod/westus2/prod/observability/terragrunt.hcl b/live/azure/workload-prod/westus2/production/observability/terragrunt.hcl similarity index 100% rename from live/azure/workload-prod/westus2/prod/observability/terragrunt.hcl rename to live/azure/workload-prod/westus2/production/observability/terragrunt.hcl diff --git a/live/azure/workload-prod/westus2/prod/secrets/terragrunt.hcl b/live/azure/workload-prod/westus2/production/secrets/terragrunt.hcl similarity index 100% rename from live/azure/workload-prod/westus2/prod/secrets/terragrunt.hcl rename to live/azure/workload-prod/westus2/production/secrets/terragrunt.hcl diff --git a/live/azure/workload-prod/westus2/prod/service-quotas/terragrunt.hcl b/live/azure/workload-prod/westus2/production/service-quotas/terragrunt.hcl similarity index 100% rename from live/azure/workload-prod/westus2/prod/service-quotas/terragrunt.hcl rename to live/azure/workload-prod/westus2/production/service-quotas/terragrunt.hcl