From 13bd0140532ce2a42aefc75a674bcd4d80762c82 Mon Sep 17 00:00:00 2001 From: Jonathan Chang Date: Tue, 10 Dec 2024 13:07:42 -0800 Subject: [PATCH 01/10] fix schema --- config/config.schema.json | 46 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/config/config.schema.json b/config/config.schema.json index 320b37062..1d5056861 100644 --- a/config/config.schema.json +++ b/config/config.schema.json @@ -620,7 +620,27 @@ }, "subscription": { "type": "string" - } + }, + "istio": { + "type": "object", + "properties": { + "istioctlUrl": { + "type": "string" + }, + "istioctlVersion": { + "type": "string" + }, + "tag": { + "type": "string" + }, + "currentVersion": { + "type": "string" + }, + "newVersion": { + "type": "string" + } + } + } }, "additionalProperties": false, "required": [ @@ -635,6 +655,30 @@ }, "vnetAddressPrefix": { "type": "string" + }, + "geographies": { + "type": "array", + "properties": { + "name": { + "type": "string" + }, + "regions": { + "type": "array", + "properties": { + "name": { + "type": "string" + }, + "settings": { + "type": "object", + "properties": { + "mgmt": { + "type": "number" + } + } + } + } + } + } } }, "additionalProperties": false, From fbd156ca64d413628a797bd7f91eda6bfd7f8c3e Mon Sep 17 00:00:00 2001 From: Jonathan Chang Date: Tue, 10 Dec 2024 13:11:27 -0800 Subject: [PATCH 02/10] add geo --- config/config.msft.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/config/config.msft.yaml b/config/config.msft.yaml index ed3bb89b2..cbb7086fe 100644 --- a/config/config.msft.yaml +++ b/config/config.msft.yaml @@ -30,6 +30,12 @@ defaults: etcd: kvName: arohcp-etcd-{{ .ctx.regionShort }} kvSoftDelete: true + istio: + istioctlUrl: "https://istio.io/downloadIstio" + istioctlVersion: "1.23.1" + tag: "prod-stable" + currentVersion: "asm-1-22" + newVersion: "" # MGMT cluster specifics mgmt: @@ -215,3 +221,12 @@ clouds: # 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: '/subscriptions/5299e6b7-b23b-46c8-8277-dc1147807117/resourcegroups/global-shared-resources/providers/Microsoft.ManagedIdentity/userAssignedIdentities/aroint-int-public-oidc' + + # Geographies + geographies: + - name: "United Kingdom" + regions: + - name: "uksouth" + settings: + mgmt: 3 + \ No newline at end of file From 212fa3a4e96eff377ed3cbdc98addce81fb6f6a3 Mon Sep 17 00:00:00 2001 From: Jonathan Chang Date: Tue, 10 Dec 2024 13:18:03 -0800 Subject: [PATCH 03/10] fix lint --- config/config.msft.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/config.msft.yaml b/config/config.msft.yaml index cbb7086fe..a51a9821b 100644 --- a/config/config.msft.yaml +++ b/config/config.msft.yaml @@ -221,7 +221,7 @@ clouds: # 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: '/subscriptions/5299e6b7-b23b-46c8-8277-dc1147807117/resourcegroups/global-shared-resources/providers/Microsoft.ManagedIdentity/userAssignedIdentities/aroint-int-public-oidc' - + # Geographies geographies: - name: "United Kingdom" @@ -229,4 +229,4 @@ clouds: - name: "uksouth" settings: mgmt: 3 - \ No newline at end of file + \ No newline at end of file From 0160f9d9d72e28c70c5b950d5c76cfc478c923df Mon Sep 17 00:00:00 2001 From: Jonathan Chang Date: Tue, 10 Dec 2024 13:20:58 -0800 Subject: [PATCH 04/10] fix lint --- config/config.msft.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/config/config.msft.yaml b/config/config.msft.yaml index a51a9821b..209a895f6 100644 --- a/config/config.msft.yaml +++ b/config/config.msft.yaml @@ -229,4 +229,3 @@ clouds: - name: "uksouth" settings: mgmt: 3 - \ No newline at end of file From 98fab5e5d84f7f3fa43ef97e02459f7ca28924bd Mon Sep 17 00:00:00 2001 From: Jonathan Chang Date: Tue, 10 Dec 2024 15:10:35 -0800 Subject: [PATCH 05/10] remove unused version --- config/config.msft.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/config/config.msft.yaml b/config/config.msft.yaml index 209a895f6..8dde6cd3b 100644 --- a/config/config.msft.yaml +++ b/config/config.msft.yaml @@ -34,7 +34,6 @@ defaults: istioctlUrl: "https://istio.io/downloadIstio" istioctlVersion: "1.23.1" tag: "prod-stable" - currentVersion: "asm-1-22" newVersion: "" # MGMT cluster specifics From 0eb540d57ad8917190d147cf84b414b9fb9f5a52 Mon Sep 17 00:00:00 2001 From: Jonathan Chang Date: Tue, 10 Dec 2024 15:25:02 -0800 Subject: [PATCH 06/10] add error message in make file --- config/Makefile | 2 +- config/config.msft.yaml | 1 + config/public-cloud-cs-pr.json | 2 ++ config/public-cloud-dev.json | 2 ++ config/public-cloud-msft-int.json | 21 +++++++++++++++++++++ config/public-cloud-personal-dev.json | 2 ++ 6 files changed, 29 insertions(+), 1 deletion(-) diff --git a/config/Makefile b/config/Makefile index 595050382..0de74465d 100644 --- a/config/Makefile +++ b/config/Makefile @@ -15,7 +15,7 @@ detect-change: materialize echo "Please review the diffs below:\n\n"; \ echo "$$diff_output"; \ echo "\n\n===================================================="; \ - echo "\n\nOnce you reviewed the changes and consider them meaningful, commit them."; \ + echo "\n\nOnce you reviewed the changes and consider them meaningful, commit them by running "make -C config/ materialize"."; \ echo "\n\n===================================================="; \ exit 1; \ else \ diff --git a/config/config.msft.yaml b/config/config.msft.yaml index 8dde6cd3b..8a64b59c9 100644 --- a/config/config.msft.yaml +++ b/config/config.msft.yaml @@ -34,6 +34,7 @@ defaults: istioctlUrl: "https://istio.io/downloadIstio" istioctlVersion: "1.23.1" tag: "prod-stable" + version: "asm-1-22" newVersion: "" # MGMT cluster specifics diff --git a/config/public-cloud-cs-pr.json b/config/public-cloud-cs-pr.json index 66c3860a6..25b1d48ef 100644 --- a/config/public-cloud-cs-pr.json +++ b/config/public-cloud-cs-pr.json @@ -1,3 +1,5 @@ +make[1]: Entering directory '/home/jonathan/microsoft/ARO-HCP/tooling/templatize' +make[1]: Leaving directory '/home/jonathan/microsoft/ARO-HCP/tooling/templatize' { "aksName": "aro-hcp-aks", "armHelperClientId": "2c6ca254-36bd-43c8-a7a8-fe880bc2c489", diff --git a/config/public-cloud-dev.json b/config/public-cloud-dev.json index a2fd1b8c7..01d82696c 100644 --- a/config/public-cloud-dev.json +++ b/config/public-cloud-dev.json @@ -1,3 +1,5 @@ +make[1]: Entering directory '/home/jonathan/microsoft/ARO-HCP/tooling/templatize' +make[1]: Leaving directory '/home/jonathan/microsoft/ARO-HCP/tooling/templatize' { "aksName": "aro-hcp-aks", "armHelperClientId": "2c6ca254-36bd-43c8-a7a8-fe880bc2c489", diff --git a/config/public-cloud-msft-int.json b/config/public-cloud-msft-int.json index 8527659be..d71369730 100644 --- a/config/public-cloud-msft-int.json +++ b/config/public-cloud-msft-int.json @@ -1,3 +1,5 @@ +make[1]: Entering directory '/home/jonathan/microsoft/ARO-HCP/tooling/templatize' +make[1]: Leaving directory '/home/jonathan/microsoft/ARO-HCP/tooling/templatize' { "aksName": "aro-hcp-aks", "armHelperClientId": "", @@ -31,6 +33,18 @@ "private": false } }, + "geographies": [ + { + "name": "United Kingdom", + "regions": [ + { + "mgmt": 3, + "name": "uksouth", + "settings": null + } + ] + } + ], "global": { "manageTokenCustomRole": false, "region": "uksouth", @@ -147,6 +161,13 @@ "kvName": "arohcp-etcd-int", "kvSoftDelete": true }, + "istio": { + "istioctlUrl": "https://istio.io/downloadIstio", + "istioctlVersion": "1.23.1", + "newVersion": "", + "tag": "prod-stable", + "version": "asm-1-22" + }, "rg": "hcp-underlay-westus3-svc", "subscription": "hcp-westus3", "userAgentPool": { diff --git a/config/public-cloud-personal-dev.json b/config/public-cloud-personal-dev.json index b1155a770..284d07f45 100644 --- a/config/public-cloud-personal-dev.json +++ b/config/public-cloud-personal-dev.json @@ -1,3 +1,5 @@ +make[1]: Entering directory '/home/jonathan/microsoft/ARO-HCP/tooling/templatize' +make[1]: Leaving directory '/home/jonathan/microsoft/ARO-HCP/tooling/templatize' { "aksName": "aro-hcp-aks", "armHelperClientId": "2c6ca254-36bd-43c8-a7a8-fe880bc2c489", From 9eec6bba3cd438e4e9f9254d7d8cbb6f26b79fec Mon Sep 17 00:00:00 2001 From: Jonathan Chang Date: Tue, 10 Dec 2024 15:35:01 -0800 Subject: [PATCH 07/10] fix config --- config/config.msft.yaml | 2 +- config/config.schema.json | 4 ++-- config/public-cloud-msft-int.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/config.msft.yaml b/config/config.msft.yaml index 8a64b59c9..b1524bd1d 100644 --- a/config/config.msft.yaml +++ b/config/config.msft.yaml @@ -31,7 +31,7 @@ defaults: kvName: arohcp-etcd-{{ .ctx.regionShort }} kvSoftDelete: true istio: - istioctlUrl: "https://istio.io/downloadIstio" + url: "https://istio.io/downloadIstio" istioctlVersion: "1.23.1" tag: "prod-stable" version: "asm-1-22" diff --git a/config/config.schema.json b/config/config.schema.json index 1d5056861..ced5588b1 100644 --- a/config/config.schema.json +++ b/config/config.schema.json @@ -624,7 +624,7 @@ "istio": { "type": "object", "properties": { - "istioctlUrl": { + "url": { "type": "string" }, "istioctlVersion": { @@ -633,7 +633,7 @@ "tag": { "type": "string" }, - "currentVersion": { + "version": { "type": "string" }, "newVersion": { diff --git a/config/public-cloud-msft-int.json b/config/public-cloud-msft-int.json index d71369730..bb479ce6d 100644 --- a/config/public-cloud-msft-int.json +++ b/config/public-cloud-msft-int.json @@ -162,10 +162,10 @@ make[1]: Leaving directory '/home/jonathan/microsoft/ARO-HCP/tooling/templatize' "kvSoftDelete": true }, "istio": { - "istioctlUrl": "https://istio.io/downloadIstio", "istioctlVersion": "1.23.1", "newVersion": "", "tag": "prod-stable", + "url": "https://istio.io/downloadIstio", "version": "asm-1-22" }, "rg": "hcp-underlay-westus3-svc", From 25fe6c249e48f2898a5a64f65637526cbefd2fc1 Mon Sep 17 00:00:00 2001 From: Jonathan Chang Date: Tue, 10 Dec 2024 15:58:49 -0800 Subject: [PATCH 08/10] remove --- config/public-cloud-cs-pr.json | 2 -- config/public-cloud-dev.json | 2 -- config/public-cloud-msft-int.json | 2 -- config/public-cloud-personal-dev.json | 2 -- 4 files changed, 8 deletions(-) diff --git a/config/public-cloud-cs-pr.json b/config/public-cloud-cs-pr.json index 25b1d48ef..66c3860a6 100644 --- a/config/public-cloud-cs-pr.json +++ b/config/public-cloud-cs-pr.json @@ -1,5 +1,3 @@ -make[1]: Entering directory '/home/jonathan/microsoft/ARO-HCP/tooling/templatize' -make[1]: Leaving directory '/home/jonathan/microsoft/ARO-HCP/tooling/templatize' { "aksName": "aro-hcp-aks", "armHelperClientId": "2c6ca254-36bd-43c8-a7a8-fe880bc2c489", diff --git a/config/public-cloud-dev.json b/config/public-cloud-dev.json index 01d82696c..a2fd1b8c7 100644 --- a/config/public-cloud-dev.json +++ b/config/public-cloud-dev.json @@ -1,5 +1,3 @@ -make[1]: Entering directory '/home/jonathan/microsoft/ARO-HCP/tooling/templatize' -make[1]: Leaving directory '/home/jonathan/microsoft/ARO-HCP/tooling/templatize' { "aksName": "aro-hcp-aks", "armHelperClientId": "2c6ca254-36bd-43c8-a7a8-fe880bc2c489", diff --git a/config/public-cloud-msft-int.json b/config/public-cloud-msft-int.json index bb479ce6d..048be68cc 100644 --- a/config/public-cloud-msft-int.json +++ b/config/public-cloud-msft-int.json @@ -1,5 +1,3 @@ -make[1]: Entering directory '/home/jonathan/microsoft/ARO-HCP/tooling/templatize' -make[1]: Leaving directory '/home/jonathan/microsoft/ARO-HCP/tooling/templatize' { "aksName": "aro-hcp-aks", "armHelperClientId": "", diff --git a/config/public-cloud-personal-dev.json b/config/public-cloud-personal-dev.json index 284d07f45..b1155a770 100644 --- a/config/public-cloud-personal-dev.json +++ b/config/public-cloud-personal-dev.json @@ -1,5 +1,3 @@ -make[1]: Entering directory '/home/jonathan/microsoft/ARO-HCP/tooling/templatize' -make[1]: Leaving directory '/home/jonathan/microsoft/ARO-HCP/tooling/templatize' { "aksName": "aro-hcp-aks", "armHelperClientId": "2c6ca254-36bd-43c8-a7a8-fe880bc2c489", From b8978d4c41f0f26db07df1d21fee8b2f91dd49a1 Mon Sep 17 00:00:00 2001 From: Jonathan Chang Date: Wed, 11 Dec 2024 11:18:38 -0800 Subject: [PATCH 09/10] remove unused --- config/config.msft.yaml | 8 -------- config/config.schema.json | 24 ------------------------ config/public-cloud-msft-int.json | 12 ------------ 3 files changed, 44 deletions(-) diff --git a/config/config.msft.yaml b/config/config.msft.yaml index b1524bd1d..5dee3c9d5 100644 --- a/config/config.msft.yaml +++ b/config/config.msft.yaml @@ -221,11 +221,3 @@ clouds: # 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: '/subscriptions/5299e6b7-b23b-46c8-8277-dc1147807117/resourcegroups/global-shared-resources/providers/Microsoft.ManagedIdentity/userAssignedIdentities/aroint-int-public-oidc' - - # Geographies - geographies: - - name: "United Kingdom" - regions: - - name: "uksouth" - settings: - mgmt: 3 diff --git a/config/config.schema.json b/config/config.schema.json index ced5588b1..da511db82 100644 --- a/config/config.schema.json +++ b/config/config.schema.json @@ -655,30 +655,6 @@ }, "vnetAddressPrefix": { "type": "string" - }, - "geographies": { - "type": "array", - "properties": { - "name": { - "type": "string" - }, - "regions": { - "type": "array", - "properties": { - "name": { - "type": "string" - }, - "settings": { - "type": "object", - "properties": { - "mgmt": { - "type": "number" - } - } - } - } - } - } } }, "additionalProperties": false, diff --git a/config/public-cloud-msft-int.json b/config/public-cloud-msft-int.json index 048be68cc..cdf1c7390 100644 --- a/config/public-cloud-msft-int.json +++ b/config/public-cloud-msft-int.json @@ -31,18 +31,6 @@ "private": false } }, - "geographies": [ - { - "name": "United Kingdom", - "regions": [ - { - "mgmt": 3, - "name": "uksouth", - "settings": null - } - ] - } - ], "global": { "manageTokenCustomRole": false, "region": "uksouth", From f98e224f5e23beddef4bb1741c9c37e62c4290b9 Mon Sep 17 00:00:00 2001 From: Jonathan Chang Date: Wed, 11 Dec 2024 14:17:54 -0800 Subject: [PATCH 10/10] add description --- config/config.schema.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/config.schema.json b/config/config.schema.json index da511db82..fdb7efb50 100644 --- a/config/config.schema.json +++ b/config/config.schema.json @@ -625,18 +625,23 @@ "type": "object", "properties": { "url": { + "description": "The download Url for istioctl", "type": "string" }, "istioctlVersion": { + "description": "Latest version of istioctl. This is used to download the istioctl", "type": "string" }, "tag": { + "description": "The revision tag used in istioctl", "type": "string" }, "version": { + "description": "The current istio version in the aks cluster", "type": "string" }, "newVersion": { + "description": "The istio version that will be updated to", "type": "string" } }