templatize ev2 gap (#825)

* template ev2 gap Signed-off-by: Gerd Oberlechner <[email protected]> * cleanup Signed-off-by: Gerd Oberlechner <[email protected]> * human readable region short names Signed-off-by: Gerd Oberlechner <[email protected]> * restructure pipeline.yaml Signed-off-by: Gerd Oberlechner <[email protected]> --------- Signed-off-by: Gerd Oberlechner <[email protected]>
Azure · Nov 14, 2024 · 65de40a · 65de40a
1 parent ee3b863
commit 65de40a
Show file tree

Hide file tree

Showing 41 changed files with 1,915 additions and 503 deletions.
diff --git a/config/config.yaml b/config/config.yaml
@@ -1,11 +1,14 @@
 defaults:
   region: {{ .ctx.region }}
+  # Subscriptions
+  serviceClusterSubscription: hcp-{{ .ctx.region }}
+  managementClusterSubscription: hcp-{{ .ctx.region }}
   # Resourcegroups
   globalRG: global
-  regionRG: hcp-underlay-{{ .ctx.region }}-{{ .ctx.regionStamp }}
-  serviceClusterRG: hcp-underlay-{{ .ctx.region }}-{{ .ctx.regionStamp }}-svc
-  managementClusterRG: hcp-underlay-{{ .ctx.region }}-{{ .ctx.regionStamp }}-mgmt-{{ .ctx.cxStamp }}
-  imageSyncRG: hcp-underlay-{{ .ctx.region }}-{{ .ctx.regionStamp }}-imagesync
+  regionRG: hcp-underlay-{{ .ctx.regionShort }}
+  serviceClusterRG: hcp-underlay-{{ .ctx.regionShort }}-svc
+  managementClusterRG: hcp-underlay-{{ .ctx.regionShort }}-mgmt-{{ .ctx.stamp }}
+  imageSyncRG: hcp-underlay-{{ .ctx.regionShort }}-imagesync
 
   # General AKS config
   kubernetesVersion: 1.30.5
@@ -19,30 +22,30 @@ defaults:
   serviceComponentAcrResourceGroups: global
 
   # SVC cluster specifics
-  svcEtcdKVName: {{ azureKeyVaultName "aro-hcp-etcd" 5 .ctx.region .ctx.regionStamp }}
+  svcEtcdKVName: arohcp-etcd-{{ .ctx.regionShort }}
   svcEtcdKVSoftDelete: true
 
   # MGMT cluster specifics
-  mgmtEtcdKVName: {{ azureKeyVaultName "aro-hcp-etcd" 5 .ctx.region .ctx.regionStamp .ctx.cxStamp }}
+  mgmtEtcdKVName: arohcp-etcd-{{ .ctx.regionShort }}-{{ .ctx.stamp }}
   mgmtEtcdKVSoftDelete: true
 
   # Frontend
   frontendCosmosDBDeploy: true
   frontendCosmosDBDisableLocalAuth: true
-  frontendCosmosDBName: {{ azureCosmosDBName "aro-hcp-rp" 5 .ctx.region .ctx.regionStamp }}
+  frontendCosmosDBName: arohcp-rp-{{ .ctx.regionShort }}
 
   # Maestro
-  maestroKeyVaultName: {{ azureKeyVaultName "maestro" 5 .ctx.region .ctx.regionStamp }}
-  maestroEventgridName: {{ azureEventGridName "maestro" 5 .ctx.region .ctx.regionStamp }}
+  maestroKeyVaultName: arohcp-maestro-{{ .ctx.regionShort }}
+  maestroEventgridName: arohcp-maestro-{{ .ctx.regionShort }}
   maestroEventGridMaxClientSessionsPerAuthName: '4'
   maestroCertDomain: 'selfsigned.maestro.keyvault.azure.com'
-  maestroPostgresName: {{ azurePostgresName "maestro" 5 .ctx.region .ctx.regionStamp }}
+  maestroPostgresName: arohcp-maestro-{{ .ctx.regionShort }}
   maestroPostgresServerVersion: '15'
   maestroPostgresServerStorageSizeGB: '32'
   maestroPostgresDeploy: true
   maestroPostgresPrivate: false
   maestroRestrictIstioIngress: true
-  maestroConsumerName: hcp-underlay-{{ .ctx.region }}-{{ .ctx.regionStamp }}-mgmt-{{ .ctx.cxStamp }}
+  maestroConsumerName: hcp-underlay-{{ .ctx.regionShort }}-mgmt-{{ .ctx.stamp }}
 
   # Hypershift
   hypershiftNamespace: hypershift
@@ -51,7 +54,7 @@ defaults:
   externalDNSServiceAccountName: external-dns
 
   # Cluster Service
-  clusterServicePostgresName: {{ azurePostgresName "cs" 5 .ctx.region .ctx.regionStamp }}
+  clusterServicePostgresName: arohcp-cs-{{ .ctx.regionShort }}
   clusterServicePostgresDeploy: true
   clusterServicePostgresPrivate: false
   clusterServiceAcrRG: global
@@ -66,20 +69,20 @@ defaults:
   ocMirrorImageTag: 7abc8af
 
   # Service KeyVault
-  serviceKeyVaultName: {{ azureKeyVaultName "aro-hcp-svc" 5 .ctx.region .ctx.regionStamp }}
-  serviceKeyVaultRG: hcp-underlay-{{ .ctx.region }}-svc-{{ .ctx.regionStamp }}
+  serviceKeyVaultName: arohcp-svc-{{ .ctx.regionShort }}
+  serviceKeyVaultRG: hcp-underlay-{{ .ctx.regionShort }}
   serviceKeyVaultRegion: {{ .ctx.region }}
   serviceKeyVaultSoftDelete: true
   serviceKeyVaultPrivate: true
 
   # Management Cluster KV
-  cxKeyVaultName: {{ azureKeyVaultName "aro-hcp-cx" 5 .ctx.region .ctx.regionStamp .ctx.cxStamp }}
+  cxKeyVaultName: arohcp-cx-{{ .ctx.regionShort }}-{{ .ctx.stamp }}
   cxKeyVaultSoftDelete: true
   cxKeyVaultPrivate: true
-  msiKeyVaultName: {{ azureKeyVaultName "aro-hcp-msi" 5 .ctx.region .ctx.regionStamp .ctx.cxStamp }}
+  msiKeyVaultName: arohcp-msi-{{ .ctx.regionShort }}-{{ .ctx.stamp }}
   msiKeyVaultSoftDelete: true
   msiKeyVaultPrivate: true
-  mgmtKeyVaultName: {{ azureKeyVaultName "aro-hcp-mgmt" 5 .ctx.region .ctx.regionStamp .ctx.cxStamp }}
+  mgmtKeyVaultName: arohcp-mgmt-{{ .ctx.regionShort }}-{{ .ctx.stamp }}
   mgmtKeyVaultSoftDelete: true
   mgmtKeyVaultPrivate: true
 
@@ -90,6 +93,9 @@ clouds:
     # this configuration serves as a template for for all RH DEV subscription deployments
     # the following vars need approprivate overrides:
     defaults:
+      # Subscription
+      serviceClusterSubscription: ARO Hosted Control Planes (EA Subscription 1)
+      managementClusterSubscription: ARO Hosted Control Planes (EA Subscription 1)
       # DNS
       baseDnsZoneName: 'hcp.osadev.cloud'
       # MGMTM AKS nodepools - big enough for 2 HCPs
@@ -136,11 +142,11 @@ clouds:
       # Shared Image Sync
       imageSyncRG: hcp-underlay-westus3-imagesync-dev
       # OIDC
-      oidcStorageAccountName: {{ azureStorageAccountName "arohcpoidc" 5 .ctx.region .ctx.regionStamp }}
+      oidcStorageAccountName: arohcpoidc{{ .ctx.regionShort }}
       # Metrics
-      monitoringWorkspaceName: 'aro-hcp-monitor-{{ uniqueString 5 .ctx.region .ctx.regionStamp}}'
-      grafanaName: 'aro-hcp-grafana-{{ uniqueString 5 .ctx.region .ctx.regionStamp}}'
-      monitoringMsiName: 'aro-hcp-metrics-msi-{{ uniqueString 5 .ctx.region .ctx.regionStamp }}'
+      monitoringWorkspaceName: 'arohcp-{{ .ctx.regionShort }}'
+      grafanaName: 'arohcp-{{ .ctx.regionShort }}'
+      monitoringMsiName: 'aro-hcp-metrics-msi-{{ .ctx.regionShort }}'
       grafanaAdminGroupPrincipalId: 6b6d3adf-8476-4727-9812-20ffdef2b85c
       # DEVOPS MSI
       aroDevopsMsiId: '/subscriptions/1d3378d3-5a3f-4712-85a1-2485495dfc4b/resourceGroups/global/providers/Microsoft.ManagedIdentity/userAssignedIdentities/aro-hcp-devops'
@@ -153,6 +159,9 @@ clouds:
           mgmtUserAgentPoolMaxCount: 12
           # DNS
           regionalDNSSubdomain: '{{ .ctx.region }}'
+        regions:
+          westus2:
+            mgmtUserAgentPoolMinCount: 5
       cs-pr:
         # this is the cluster service PR check and full cycle test environment
         defaults:
@@ -169,7 +178,7 @@ clouds:
           # Cluster Service
           clusterServicePostgresDeploy: false
           # DNS
-          regionalDNSSubdomain: '{{ .ctx.region }}-{{ uniqueString 5 .ctx.region .ctx.regionStamp }}'
+          regionalDNSSubdomain: '{{ .ctx.regionShort }}'
           # Hypershift
           # uncomment the following line if you want to install the hypershift operator
           # with CRD support for managedIdentities

diff --git a/config/public-cloud-cs-pr.json b/config/public-cloud-cs-pr.json
@@ -8,9 +8,9 @@
   "clusterServiceImageRepo": "app-sre/uhc-clusters-service",
   "clusterServiceImageTag": "a23276d",
   "clusterServicePostgresDeploy": true,
-  "clusterServicePostgresName": "cs-9c782",
+  "clusterServicePostgresName": "arohcp-cs-cspr",
   "clusterServicePostgresPrivate": false,
-  "cxKeyVaultName": "aro-hcp-cx-1abb8",
+  "cxKeyVaultName": "arohcp-cx-cspr-1",
   "cxKeyVaultPrivate": false,
   "cxKeyVaultSoftDelete": false,
   "externalDNSImageTag": "v0.14.2",
@@ -19,10 +19,10 @@
   "firstPartyAppClientId": "57e54810-3138-4f38-bd3b-29cb33f4c358",
   "frontendCosmosDBDeploy": true,
   "frontendCosmosDBDisableLocalAuth": true,
-  "frontendCosmosDBName": "aro-hcp-rp-9c782",
+  "frontendCosmosDBName": "arohcp-rp-cspr",
   "globalRG": "global",
   "grafanaAdminGroupPrincipalId": "6b6d3adf-8476-4727-9812-20ffdef2b85c",
-  "grafanaName": "aro-hcp-grafana-9c782",
+  "grafanaName": "arohcp-cspr",
   "hypershiftAdditionalInstallArg": "",
   "hypershiftNamespace": "hypershift",
   "hypershiftOperatorImageTag": "a95fc46",
@@ -35,22 +35,23 @@
   "istioVersion": "['asm-1-22']",
   "kubernetesVersion": "1.30.5",
   "maestroCertDomain": "selfsigned.maestro.keyvault.azure.com",
-  "maestroConsumerName": "hcp-underlay-westus3-cs-pr-mgmt-1",
+  "maestroConsumerName": "hcp-underlay-cspr-mgmt-1",
   "maestroEventGridMaxClientSessionsPerAuthName": "4",
-  "maestroEventgridName": "maestro-9c782",
+  "maestroEventgridName": "arohcp-maestro-cspr",
   "maestroImageBase": "quay.io/redhat-user-workloads/maestro-rhtap-tenant/maestro/maestro",
   "maestroImageTag": "ea066c250a002f0cc458711945165591bc9f6d3f",
-  "maestroKeyVaultName": "maestro-9c782",
+  "maestroKeyVaultName": "arohcp-maestro-cspr",
   "maestroPostgresDeploy": false,
-  "maestroPostgresName": "maestro-9c782",
+  "maestroPostgresName": "arohcp-maestro-cspr",
   "maestroPostgresPrivate": false,
   "maestroPostgresServerStorageSizeGB": "32",
   "maestroPostgresServerVersion": "15",
   "maestroRestrictIstioIngress": false,
-  "managementClusterRG": "hcp-underlay-westus3-cs-pr-mgmt-1",
-  "mgmtEtcdKVName": "aro-hcp-etcd-1abb8",
+  "managementClusterRG": "hcp-underlay-cspr-mgmt-1",
+  "managementClusterSubscription": "ARO Hosted Control Planes (EA Subscription 1)",
+  "mgmtEtcdKVName": "arohcp-etcd-cspr-1",
   "mgmtEtcdKVSoftDelete": false,
-  "mgmtKeyVaultName": "aro-hcp-mgmt-1abb8",
+  "mgmtKeyVaultName": "arohcp-mgmt-cspr-1",
   "mgmtKeyVaultPrivate": false,
   "mgmtKeyVaultSoftDelete": false,
   "mgmtSystemAgentPoolMaxCount": 4,
@@ -62,20 +63,21 @@
   "mgmtUserAgentPoolMinCount": 2,
   "mgmtUserAgentPoolOsDiskSizeGB": 100,
   "mgmtUserAgentPoolVmSize": "Standard_D4s_v3",
-  "monitoringMsiName": "aro-hcp-metrics-msi-9c782",
-  "monitoringWorkspaceName": "aro-hcp-monitor-9c782",
-  "msiKeyVaultName": "aro-hcp-msi-1abb8",
+  "monitoringMsiName": "aro-hcp-metrics-msi-cspr",
+  "monitoringWorkspaceName": "arohcp-cspr",
+  "msiKeyVaultName": "arohcp-msi-cspr-1",
   "msiKeyVaultPrivate": false,
   "msiKeyVaultSoftDelete": false,
   "ocMirrorImageRepo": "image-sync/oc-mirror",
   "ocMirrorImageTag": "7abc8af",
   "ocpAcrName": "arohcpocpdev",
-  "oidcStorageAccountName": "arohcpoidc9c782",
+  "oidcStorageAccountName": "arohcpoidccspr",
   "podSubnetPrefix": "10.128.64.0/18",
   "region": "westus3",
-  "regionRG": "hcp-underlay-westus3-cs-pr",
+  "regionRG": "hcp-underlay-cspr",
   "regionalDNSSubdomain": "westus3-cs",
-  "serviceClusterRG": "hcp-underlay-westus3-cs-pr-svc",
+  "serviceClusterRG": "hcp-underlay-cspr-svc",
+  "serviceClusterSubscription": "ARO Hosted Control Planes (EA Subscription 1)",
   "serviceComponentAcrResourceGroups": "global",
   "serviceKeyVaultName": "aro-hcp-dev-svc-kv",
   "serviceKeyVaultPrivate": false,
@@ -84,7 +86,7 @@
   "serviceKeyVaultSoftDelete": true,
   "subnetPrefix": "10.128.8.0/21",
   "svcAcrName": "arohcpsvcdev",
-  "svcEtcdKVName": "aro-hcp-etcd-9c782",
+  "svcEtcdKVName": "arohcp-etcd-cspr",
   "svcEtcdKVSoftDelete": false,
   "vnetAddressPrefix": "10.128.0.0/14"
 }
diff --git a/config/public-cloud-dev.json b/config/public-cloud-dev.json
@@ -8,9 +8,9 @@
   "clusterServiceImageRepo": "app-sre/uhc-clusters-service",
   "clusterServiceImageTag": "a23276d",
   "clusterServicePostgresDeploy": true,
-  "clusterServicePostgresName": "cs-157ff",
+  "clusterServicePostgresName": "arohcp-cs-dev",
   "clusterServicePostgresPrivate": false,
-  "cxKeyVaultName": "aro-hcp-cx-08101",
+  "cxKeyVaultName": "arohcp-cx-dev-1",
   "cxKeyVaultPrivate": false,
   "cxKeyVaultSoftDelete": false,
   "externalDNSImageTag": "v0.14.2",
@@ -19,10 +19,10 @@
   "firstPartyAppClientId": "57e54810-3138-4f38-bd3b-29cb33f4c358",
   "frontendCosmosDBDeploy": true,
   "frontendCosmosDBDisableLocalAuth": true,
-  "frontendCosmosDBName": "aro-hcp-rp-157ff",
+  "frontendCosmosDBName": "arohcp-rp-dev",
   "globalRG": "global",
   "grafanaAdminGroupPrincipalId": "6b6d3adf-8476-4727-9812-20ffdef2b85c",
-  "grafanaName": "aro-hcp-grafana-157ff",
+  "grafanaName": "arohcp-dev",
   "hypershiftAdditionalInstallArg": "",
   "hypershiftNamespace": "hypershift",
   "hypershiftOperatorImageTag": "a95fc46",
@@ -35,22 +35,23 @@
   "istioVersion": "['asm-1-22']",
   "kubernetesVersion": "1.30.5",
   "maestroCertDomain": "selfsigned.maestro.keyvault.azure.com",
-  "maestroConsumerName": "hcp-underlay-westus3-dev-mgmt-1",
+  "maestroConsumerName": "hcp-underlay-dev-mgmt-1",
   "maestroEventGridMaxClientSessionsPerAuthName": "4",
-  "maestroEventgridName": "maestro-157ff",
+  "maestroEventgridName": "arohcp-maestro-dev",
   "maestroImageBase": "quay.io/redhat-user-workloads/maestro-rhtap-tenant/maestro/maestro",
   "maestroImageTag": "ea066c250a002f0cc458711945165591bc9f6d3f",
-  "maestroKeyVaultName": "maestro-157ff",
+  "maestroKeyVaultName": "arohcp-maestro-dev",
   "maestroPostgresDeploy": false,
-  "maestroPostgresName": "maestro-157ff",
+  "maestroPostgresName": "arohcp-maestro-dev",
   "maestroPostgresPrivate": false,
   "maestroPostgresServerStorageSizeGB": "32",
   "maestroPostgresServerVersion": "15",
   "maestroRestrictIstioIngress": true,
-  "managementClusterRG": "hcp-underlay-westus3-dev-mgmt-1",
-  "mgmtEtcdKVName": "aro-hcp-etcd-08101",
+  "managementClusterRG": "hcp-underlay-dev-mgmt-1",
+  "managementClusterSubscription": "ARO Hosted Control Planes (EA Subscription 1)",
+  "mgmtEtcdKVName": "arohcp-etcd-dev-1",
   "mgmtEtcdKVSoftDelete": false,
-  "mgmtKeyVaultName": "aro-hcp-mgmt-08101",
+  "mgmtKeyVaultName": "arohcp-mgmt-dev-1",
   "mgmtKeyVaultPrivate": false,
   "mgmtKeyVaultSoftDelete": false,
   "mgmtSystemAgentPoolMaxCount": 4,
@@ -62,20 +63,21 @@
   "mgmtUserAgentPoolMinCount": 2,
   "mgmtUserAgentPoolOsDiskSizeGB": 100,
   "mgmtUserAgentPoolVmSize": "Standard_D4s_v3",
-  "monitoringMsiName": "aro-hcp-metrics-msi-157ff",
-  "monitoringWorkspaceName": "aro-hcp-monitor-157ff",
-  "msiKeyVaultName": "aro-hcp-msi-08101",
+  "monitoringMsiName": "aro-hcp-metrics-msi-dev",
+  "monitoringWorkspaceName": "arohcp-dev",
+  "msiKeyVaultName": "arohcp-msi-dev-1",
   "msiKeyVaultPrivate": false,
   "msiKeyVaultSoftDelete": false,
   "ocMirrorImageRepo": "image-sync/oc-mirror",
   "ocMirrorImageTag": "7abc8af",
   "ocpAcrName": "arohcpocpdev",
-  "oidcStorageAccountName": "arohcpoidc157ff",
+  "oidcStorageAccountName": "arohcpoidcdev",
   "podSubnetPrefix": "10.128.64.0/18",
   "region": "westus3",
-  "regionRG": "hcp-underlay-westus3-dev",
+  "regionRG": "hcp-underlay-dev",
   "regionalDNSSubdomain": "westus3",
-  "serviceClusterRG": "hcp-underlay-westus3-dev-svc",
+  "serviceClusterRG": "hcp-underlay-dev-svc",
+  "serviceClusterSubscription": "ARO Hosted Control Planes (EA Subscription 1)",
   "serviceComponentAcrResourceGroups": "global",
   "serviceKeyVaultName": "aro-hcp-dev-svc-kv",
   "serviceKeyVaultPrivate": false,
@@ -84,7 +86,7 @@
   "serviceKeyVaultSoftDelete": true,
   "subnetPrefix": "10.128.8.0/21",
   "svcAcrName": "arohcpsvcdev",
-  "svcEtcdKVName": "aro-hcp-etcd-157ff",
+  "svcEtcdKVName": "arohcp-etcd-dev",
   "svcEtcdKVSoftDelete": false,
   "vnetAddressPrefix": "10.128.0.0/14"
 }