Skip to content

Commit

Permalink
fix istioversion
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonathan Chang committed Dec 11, 2024
1 parent f98e224 commit 1b837ec
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 11 deletions.
1 change: 0 additions & 1 deletion config/config.msft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ defaults:

# General AKS config
kubernetesVersion: 1.30.6
istioVersion: "asm-1-22"
vnetAddressPrefix: "10.128.0.0/14"
subnetPrefix: "10.128.8.0/21"
podSubnetPrefix: "10.128.64.0/18"
Expand Down
4 changes: 0 additions & 4 deletions config/config.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -271,9 +271,6 @@
"rg"
]
},
"istioVersion": {
"type": "string"
},
"kubernetesVersion": {
"type": "string"
},
Expand Down Expand Up @@ -676,7 +673,6 @@
"hypershift",
"hypershiftOperator",
"imageSync",
"istioVersion",
"kubernetesVersion",
"maestro",
"mgmt",
Expand Down
3 changes: 2 additions & 1 deletion config/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ defaults:

# General AKS config
kubernetesVersion: 1.30.6
istioVersion: "asm-1-22"
vnetAddressPrefix: "10.128.0.0/14"
subnetPrefix: "10.128.8.0/21"
podSubnetPrefix: "10.128.64.0/18"
Expand All @@ -25,6 +24,8 @@ defaults:
svc:
subscription: hcp-{{ .ctx.region }}
rg: hcp-underlay-{{ .ctx.regionShort }}-svc
istio:
version: "asm-1-22"
etcd:
kvName: arohcp-etcd-{{ .ctx.regionShort }}
kvSoftDelete: true
Expand Down
6 changes: 5 additions & 1 deletion config/public-cloud-cs-pr.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -65,7 +67,6 @@
},
"rg": "hcp-underlay-westus3-imagesync-dev"
},
"istioVersion": "asm-1-22",
"kubernetesVersion": "1.30.6",
"maestro": {
"certDomain": "selfsigned.maestro.keyvault.azure.com",
Expand Down Expand Up @@ -147,6 +148,9 @@
"kvName": "arohcp-etcd-cspr",
"kvSoftDelete": false
},
"istio": {
"version": "asm-1-22"
},
"rg": "hcp-underlay-cspr-svc",
"subscription": "ARO Hosted Control Planes (EA Subscription 1)",
"userAgentPool": {
Expand Down
6 changes: 5 additions & 1 deletion config/public-cloud-dev.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -65,7 +67,6 @@
},
"rg": "hcp-underlay-westus3-imagesync-dev"
},
"istioVersion": "asm-1-22",
"kubernetesVersion": "1.30.6",
"maestro": {
"certDomain": "selfsigned.maestro.keyvault.azure.com",
Expand Down Expand Up @@ -147,6 +148,9 @@
"kvName": "arohcp-etcd-dev",
"kvSoftDelete": false
},
"istio": {
"version": "asm-1-22"
},
"rg": "hcp-underlay-dev-svc",
"subscription": "ARO Hosted Control Planes (EA Subscription 1)",
"userAgentPool": {
Expand Down
3 changes: 2 additions & 1 deletion config/public-cloud-msft-int.json
Original file line number Diff line number Diff line change
@@ -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": "",
Expand Down Expand Up @@ -65,7 +67,6 @@
},
"rg": "hcp-underlay-imagesync"
},
"istioVersion": "asm-1-22",
"kubernetesVersion": "1.30.6",
"maestro": {
"certDomain": "selfsigned.maestro.keyvault.azure.com",
Expand Down
6 changes: 5 additions & 1 deletion config/public-cloud-personal-dev.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -65,7 +67,6 @@
},
"rg": "hcp-underlay-westus3-imagesync-dev"
},
"istioVersion": "asm-1-22",
"kubernetesVersion": "1.30.6",
"maestro": {
"certDomain": "selfsigned.maestro.keyvault.azure.com",
Expand Down Expand Up @@ -147,6 +148,9 @@
"kvName": "arohcp-etcd-usw3tst",
"kvSoftDelete": false
},
"istio": {
"version": "asm-1-22"
},
"rg": "hcp-underlay-usw3tst-svc",
"subscription": "ARO Hosted Control Planes (EA Subscription 1)",
"userAgentPool": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using '../templates/svc-cluster.bicep'

param kubernetesVersion = '{{ .kubernetesVersion }}'
param istioVersion = ['{{ .istioVersion }}']
param istioVersion = ['{{ .svc.version }}']
param vnetAddressPrefix = '{{ .vnetAddressPrefix }}'
param subnetPrefix = '{{ .subnetPrefix }}'
param podSubnetPrefix = '{{ .podSubnetPrefix }}'
Expand Down

0 comments on commit 1b837ec

Please sign in to comment.