varous fixes

Signed-off-by: Gerd Oberlechner <[email protected]>
Azure · Nov 27, 2024 · 5252b99 · 5252b99
1 parent 126e94b
commit 5252b99
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 32 deletions.
diff --git a/config/config.msft.yaml b/config/config.msft.yaml
@@ -7,7 +7,7 @@ defaults:
 
   # General AKS config
   kubernetesVersion: 1.30.5
-  istioVersion: "['asm-1-22']"
+  istioVersion: "asm-1-22"
   vnetAddressPrefix: "10.128.0.0/14"
   subnetPrefix: "10.128.8.0/21"
   podSubnetPrefix: "10.128.64.0/18"
@@ -51,13 +51,13 @@ defaults:
   maestro:
     eventGrid:
       name: arohcp-maestro-{{ .ctx.regionShort }}
-      maxClientSessionsPerAuthName: '4'
+      maxClientSessionsPerAuthName: 4
       private: false
     certDomain: 'selfsigned.maestro.keyvault.azure.com'
     postgres:
       name: arohcp-maestro-{{ .ctx.regionShort }}
       serverVersion: '15'
-      serverStorageSizeGB: '32'
+      serverStorageSizeGB: 32
       deploy: false
       private: false
       minTLSVersion: 'TLSV1.2'
@@ -90,7 +90,7 @@ defaults:
 
   serviceKeyVault:
     name: arohcp-svc-{{ .ctx.regionShort }}
-    rg: hcp-underlay-{{ .ctx.regionShort }}
+    rg: hcp-underlay-{{ .ctx.region }}-svc
     region: {{ .ctx.region }}
     softDelete: false
     private: false
@@ -163,7 +163,7 @@ clouds:
               osDiskSizeGB: 100
               azCount: 3
           # DNS
-          baseDnsZoneName: aro-hcp.azure-test.net'
+          baseDnsZoneName: aro-hcp.azure-test.net
           regionalDNSSubdomain: '{{ .ctx.region }}'
 
           # ACR
@@ -192,9 +192,9 @@ clouds:
 
           # Grafana
           monitoring:
-            grafanaAdminGroupPrincipalId: '??? the one to be used as Grafana Admin in grafana.bicep ???'
+            grafanaAdminGroupPrincipalId: '2fdb57d4-3fd3-415d-b604-1d0e37a188fe' # Azure Red Hat OpenShift MSFT Engineering
 
           # DEVOPS MSI
           # lets create this MSI manually for the time being and automate soon
           # but we should use the MSI name as an input and not the resource ID of the MSI
-          aroDevopsMsiId: '??? the one for OIDC deployment script / lives in the global RG / needs to be created first thing on regional buildout ???'
+          aroDevopsMsiId: '/subscriptions/5299e6b7-b23b-46c8-8277-dc1147807117/resourcegroups/global-shared-resources/providers/Microsoft.ManagedIdentity/userAssignedIdentities/aroint-int-public-oidc'
diff --git a/config/config.schema.json b/config/config.schema.json
@@ -229,7 +229,7 @@
             "type": "object",
             "properties": {
               "maxClientSessionsPerAuthName": {
-                "type": "string"
+                "type": "integer"
               },
               "name": {
                 "type": "string"
@@ -264,7 +264,7 @@
                 "type": "boolean"
               },
               "serverStorageSizeGB": {
-                "type": "string"
+                "type": "integer"
               },
               "serverVersion": {
                 "type": "string"

diff --git a/config/config.yaml b/config/config.yaml
@@ -7,7 +7,7 @@ defaults:
 
   # General AKS config
   kubernetesVersion: 1.30.5
-  istioVersion: "['asm-1-22']"
+  istioVersion: "asm-1-22"
   vnetAddressPrefix: "10.128.0.0/14"
   subnetPrefix: "10.128.8.0/21"
   podSubnetPrefix: "10.128.64.0/18"
@@ -51,13 +51,13 @@ defaults:
   maestro:
     eventGrid:
       name: arohcp-maestro-{{ .ctx.regionShort }}
-      maxClientSessionsPerAuthName: '4'
+      maxClientSessionsPerAuthName: 4
       private: false
     certDomain: 'selfsigned.maestro.keyvault.azure.com'
     postgres:
       name: arohcp-maestro-{{ .ctx.regionShort }}
       serverVersion: '15'
-      serverStorageSizeGB: '32'
+      serverStorageSizeGB: 32
       deploy: true
       private: false
       minTLSVersion: 'TLSV1.2'

diff --git a/config/public-cloud-cs-pr.json b/config/public-cloud-cs-pr.json
@@ -51,13 +51,13 @@
     "repositories": "registry.k8s.io/external-dns/external-dns,quay.io/acm-d/rhtap-hypershift-operator,quay.io/app-sre/uhc-clusters-service,quay.io/package-operator/package-operator-package",
     "rg": "hcp-underlay-westus3-imagesync-dev"
   },
-  "istioVersion": "['asm-1-22']",
+  "istioVersion": "asm-1-22",
   "kubernetesVersion": "1.30.5",
   "maestro": {
     "certDomain": "selfsigned.maestro.keyvault.azure.com",
     "consumerName": "hcp-underlay-cspr-mgmt-1",
     "eventGrid": {
-      "maxClientSessionsPerAuthName": "4",
+      "maxClientSessionsPerAuthName": 4,
       "name": "arohcp-maestro-cspr",
       "private": false
     },
@@ -68,7 +68,7 @@
       "minTLSVersion": "TLSV1.2",
       "name": "arohcp-maestro-cspr",
       "private": false,
-      "serverStorageSizeGB": "32",
+      "serverStorageSizeGB": 32,
       "serverVersion": "15"
     },
     "restrictIstioIngress": false,

diff --git a/config/public-cloud-dev.json b/config/public-cloud-dev.json
@@ -51,13 +51,13 @@
     "repositories": "registry.k8s.io/external-dns/external-dns,quay.io/acm-d/rhtap-hypershift-operator,quay.io/app-sre/uhc-clusters-service,quay.io/package-operator/package-operator-package",
     "rg": "hcp-underlay-westus3-imagesync-dev"
   },
-  "istioVersion": "['asm-1-22']",
+  "istioVersion": "asm-1-22",
   "kubernetesVersion": "1.30.5",
   "maestro": {
     "certDomain": "selfsigned.maestro.keyvault.azure.com",
     "consumerName": "hcp-underlay-dev-mgmt-1",
     "eventGrid": {
-      "maxClientSessionsPerAuthName": "4",
+      "maxClientSessionsPerAuthName": 4,
       "name": "arohcp-maestro-dev",
       "private": false
     },
@@ -68,7 +68,7 @@
       "minTLSVersion": "TLSV1.2",
       "name": "arohcp-maestro-dev",
       "private": false,
-      "serverStorageSizeGB": "32",
+      "serverStorageSizeGB": 32,
       "serverVersion": "15"
     },
     "restrictIstioIngress": true,

diff --git a/config/public-cloud-msft-int.json b/config/public-cloud-msft-int.json
@@ -1,8 +1,8 @@
 {
   "acrName": "arohcpint",
   "aksName": "aro-hcp-aks",
-  "aroDevopsMsiId": "??? the one for OIDC deployment script / lives in the global RG / needs to be created first thing on regional buildout ???",
-  "baseDnsZoneName": "aro-hcp.azure-test.net'",
+  "aroDevopsMsiId": "/subscriptions/5299e6b7-b23b-46c8-8277-dc1147807117/resourcegroups/global-shared-resources/providers/Microsoft.ManagedIdentity/userAssignedIdentities/aroint-int-public-oidc",
+  "baseDnsZoneName": "aro-hcp.azure-test.net",
   "baseDnsZoneRG": "westus3-shared-resources",
   "clusterService": {
     "acrRG": "",
@@ -51,13 +51,13 @@
     "repositories": "registry.k8s.io/external-dns/external-dns,quay.io/acm-d/rhtap-hypershift-operator,quay.io/app-sre/uhc-clusters-service,quay.io/package-operator/package-operator-package",
     "rg": "hcp-underlay-imagesync"
   },
-  "istioVersion": "['asm-1-22']",
+  "istioVersion": "asm-1-22",
   "kubernetesVersion": "1.30.5",
   "maestro": {
     "certDomain": "selfsigned.maestro.keyvault.azure.com",
     "consumerName": "hcp-underlay-int-mgmt-1",
     "eventGrid": {
-      "maxClientSessionsPerAuthName": "4",
+      "maxClientSessionsPerAuthName": 4,
       "name": "arohcp-maestro-int",
       "private": false
     },
@@ -68,7 +68,7 @@
       "minTLSVersion": "TLSV1.2",
       "name": "arohcp-maestro-int",
       "private": false,
-      "serverStorageSizeGB": "32",
+      "serverStorageSizeGB": 32,
       "serverVersion": "15"
     },
     "restrictIstioIngress": true,
@@ -102,7 +102,7 @@
     "softDelete": false
   },
   "monitoring": {
-    "grafanaAdminGroupPrincipalId": "??? the one to be used as Grafana Admin in grafana.bicep ???",
+    "grafanaAdminGroupPrincipalId": "2fdb57d4-3fd3-415d-b604-1d0e37a188fe",
     "grafanaName": "arohcp-int",
     "msiName": "aro-hcp-metrics-msi-int",
     "workspaceName": "arohcp-int"
@@ -127,7 +127,7 @@
     "name": "arohcp-svc-int",
     "private": false,
     "region": "westus3",
-    "rg": "hcp-underlay-int",
+    "rg": "hcp-underlay-westus3-svc",
     "softDelete": false
   },
   "subnetPrefix": "10.128.8.0/21",

diff --git a/config/public-cloud-personal-dev.json b/config/public-cloud-personal-dev.json
@@ -51,13 +51,13 @@
     "repositories": "registry.k8s.io/external-dns/external-dns,quay.io/acm-d/rhtap-hypershift-operator,quay.io/app-sre/uhc-clusters-service,quay.io/package-operator/package-operator-package",
     "rg": "hcp-underlay-westus3-imagesync-dev"
   },
-  "istioVersion": "['asm-1-22']",
+  "istioVersion": "asm-1-22",
   "kubernetesVersion": "1.30.5",
   "maestro": {
     "certDomain": "selfsigned.maestro.keyvault.azure.com",
     "consumerName": "hcp-underlay-usw3tst-mgmt-1",
     "eventGrid": {
-      "maxClientSessionsPerAuthName": "4",
+      "maxClientSessionsPerAuthName": 4,
       "name": "arohcp-maestro-usw3tst",
       "private": false
     },
@@ -68,7 +68,7 @@
       "minTLSVersion": "TLSV1.2",
       "name": "arohcp-maestro-usw3tst",
       "private": false,
-      "serverStorageSizeGB": "32",
+      "serverStorageSizeGB": 32,
       "serverVersion": "15"
     },
     "restrictIstioIngress": true,

diff --git a/dev-infrastructure/configurations/svc-cluster.tmpl.bicepparam b/dev-infrastructure/configurations/svc-cluster.tmpl.bicepparam
@@ -1,7 +1,7 @@
 using '../templates/svc-cluster.bicep'
 
 param kubernetesVersion = '{{ .kubernetesVersion }}'
-param istioVersion = {{ .istioVersion }}
+param istioVersion = ['{{ .istioVersion }}']
 param vnetAddressPrefix = '{{ .vnetAddressPrefix }}'
 param subnetPrefix = '{{ .subnetPrefix }}'
 param podSubnetPrefix = '{{ .podSubnetPrefix }}'

diff --git a/dev-infrastructure/region-pipeline.yaml b/dev-infrastructure/region-pipeline.yaml
@@ -1,4 +1,4 @@
-serviceGroup: Microsoft.Azure.ARO.Test
+serviceGroup: Microsoft.Azure.ARO.HCP.Region
 rolloutName: Region Rollout
 resourceGroups:
 - name: {{ .regionRG }}
@@ -10,7 +10,7 @@ resourceGroups:
     parameters: configurations/region.tmpl.bicepparam
   - name: metrics-infra
     action: ARM
-    template: modules/modules/metrics.bicep
+    template: modules/metrics/metrics.bicep
     parameters: configurations/metrics.tmpl.bicepparam
     dependsOn:
     - region
diff --git a/dev-infrastructure/svc-pipeline.yaml b/dev-infrastructure/svc-pipeline.yaml
@@ -1,4 +1,4 @@
-serviceGroup: Microsoft.Azure.ARO.Test
+serviceGroup: Microsoft.Azure.ARO.HCP.Service.Infra
 rolloutName: Service Cluster Rollout
 resourceGroups:
 - name: {{ .svc.rg }}