Skip to content

Commit

Permalink
use workaround
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonathan Chang committed Dec 19, 2024
1 parent 1c0da4f commit ccb4195
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion config/config.msft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ defaults:
istioctlVersion: "1.24.1"
tag: "prod-stable"
targetVersion: "asm-1-23"
versions: ["\"asm-1-22\"", "\"asm-1-23\""]
versions: "asm-1-22,asm-1-23"

# MGMT cluster specifics
mgmt:
Expand Down
4 changes: 2 additions & 2 deletions config/config.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -674,8 +674,8 @@
"type": "string"
},
"versions": {
"description": "The current istio version in the AKS cluster",
"type": "array"
"description": "The current istio version in the AKS cluster, will need to change to array once tooling is ready",
"type": "string"
},
"targetVersion": {
"description": "The target istio version that will be updated to",
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 = {{ .svc.istio.versions }}
param istioVersion = ['{{ .svc.istio.versions }}']
param vnetAddressPrefix = '{{ .vnetAddressPrefix }}'
param subnetPrefix = '{{ .subnetPrefix }}'
param podSubnetPrefix = '{{ .podSubnetPrefix }}'
Expand Down
4 changes: 2 additions & 2 deletions dev-infrastructure/templates/svc-cluster.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ resource serviceKeyVault 'Microsoft.KeyVault/vaults@2024-04-01-preview' existing
name: serviceKeyVaultName
scope: resourceGroup(serviceKeyVaultResourceGroup)
}

var istio = split(istioVersion[0], ', ')
// Tags the resource group
resource subscriptionTags 'Microsoft.Resources/tags@2024-03-01' = {
name: 'default'
Expand All @@ -166,7 +166,7 @@ module svcCluster '../modules/aks-cluster-base.bicep' = {
aksEtcdKVEnableSoftDelete: aksEtcdKVEnableSoftDelete
kubernetesVersion: kubernetesVersion
deployIstio: true
istioVersion: istioVersion
istioVersion: istio
vnetAddressPrefix: vnetAddressPrefix
subnetPrefix: subnetPrefix
podSubnetPrefix: podSubnetPrefix
Expand Down

0 comments on commit ccb4195

Please sign in to comment.