revert back to array

Azure · Dec 19, 2024 · cfa7517 · cfa7517
1 parent b50600c
commit cfa7517
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/config/config.msft.yaml b/config/config.msft.yaml
@@ -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:

diff --git a/config/config.schema.json b/config/config.schema.json
@@ -675,7 +675,7 @@
               },
               "versions": {
                 "description": "The current istio version in the AKS cluster, will need to change to array once tooling is ready",
-                "type": "string"
+                "type": "array"
               },
               "targetVersion": {
                 "description": "The target istio version that will be updated to",

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 = ['{{ .svc.istio.versions }}']
+param istioVersion = {{ .svc.istio.versions }}
 param vnetAddressPrefix = '{{ .vnetAddressPrefix }}'
 param subnetPrefix = '{{ .subnetPrefix }}'
 param podSubnetPrefix = '{{ .podSubnetPrefix }}'

diff --git a/dev-infrastructure/modules/aks-cluster-base.bicep b/dev-infrastructure/modules/aks-cluster-base.bicep
@@ -358,7 +358,7 @@ resource aksCluster 'Microsoft.ContainerService/managedClusters@2024-04-02-previ
                 }
               ]
             }
-            revisions: istioVersion[0]
+            revisions: istioVersion
           }
         }
       : null

diff --git a/dev-infrastructure/templates/svc-cluster.bicep b/dev-infrastructure/templates/svc-cluster.bicep
@@ -143,8 +143,7 @@ resource serviceKeyVault 'Microsoft.KeyVault/vaults@2024-04-01-preview' existing
   name: serviceKeyVaultName
   scope: resourceGroup(serviceKeyVaultResourceGroup)
 }
-// TODO(jonachang) Once tooling support array, need to remove this
-var istio = split(istioVersion[0], ', ')
+
 // Tags the resource group
 resource subscriptionTags 'Microsoft.Resources/tags@2024-03-01' = {
   name: 'default'
@@ -167,7 +166,7 @@ module svcCluster '../modules/aks-cluster-base.bicep' = {
     aksEtcdKVEnableSoftDelete: aksEtcdKVEnableSoftDelete
     kubernetesVersion: kubernetesVersion
     deployIstio: true
-    istioVersion: istio
+    istioVersion: istioVersion
     vnetAddressPrefix: vnetAddressPrefix
     subnetPrefix: subnetPrefix
     podSubnetPrefix: podSubnetPrefix
-Original file line number
+Diff line change
@@ Expand Up @@
                     }
                   ]
                 }
-                revisions: istioVersion[0]
+                revisions: istioVersion
               }
             }
           : null
@@ Expand Down @@