Merge branch 'main' into gb-npmupdate

Azure · Oct 25, 2023 · 9cdda63 · 9cdda63
2 parents b463603 + 3f26a90
commit 9cdda63
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 11 deletions.
diff --git a/.github/workflows/ByoVnetCI.yml b/.github/workflows/ByoVnetCI.yml
@@ -83,7 +83,7 @@ permissions:
 concurrency: ci-${{ github.ref }}
 
 env:
-  AZCLIVERSION: 2.43.0 #2.30.0 #2.29.2 #2.26.0 #latest
+  AZCLIVERSION: 2.53.0 #2.43.0 #2.34.1 #2.29.2 #2.26.0 #latest
   ParamFilePath: ".github/workflows_dep/AksDeploy-ByoVnet.parameters.json"
   RESNAME: "Byov"
   DEPNAME: "Dep${{ github.run_number }}"

diff --git a/.github/workflows/ByoVnetPrivateCI.yml b/.github/workflows/ByoVnetPrivateCI.yml
@@ -80,7 +80,7 @@ on:
 env:
   ParamFilePath: ".github/workflows_dep/AksDeploy-Private.parameters.json"
   DEPNAME: 'DepPriv${{ github.run_number }}'
-  AZCLIVERSION: 2.43.0 #2.36.0 #2.30.0 #Pinning to a specific AZ CLI version
+  AZCLIVERSION: 2.53.0 #2.43.0 #2.34.1 #2.29.2 #2.26.0 #latest
 
 concurrency: ci-${{ github.event.inputs.environment }}-${{ github.ref }}
 

diff --git a/.github/workflows/OSSCI.yml b/.github/workflows/OSSCI.yml
@@ -36,7 +36,7 @@ env:
   RG: "AksBicepAcc-Ci-OssCluster" #The resource group we're deploying to.
   RESNAME: "AksOss" #Used in Azure Resource Naming, overrides the default in the parameter file
   DEPNAME: "Dep${{ github.run_number }}" #Deployment Name
-  AZCLIVERSION: 2.43.0 #Pinning to a specific AZ CLI version
+  AZCLIVERSION: 2.53.0 #2.43.0 #2.34.1 #2.29.2 #2.26.0 #latest
 
 permissions:
       id-token: write
@@ -64,7 +64,7 @@ jobs:
         run: |
           LATEST=$(curl https://api.github.com/repos/Azure/AKS-Construction/releases/latest | jq '.tag_name' -r)
           echo "LATEST=$LATEST" >> $GITHUB_OUTPUT
-          
+
   ContourDeploy:
     uses: ./.github/workflows/AKSC_Deploy.yml
     needs: [ReusableWF]

diff --git a/.github/workflows/StandardCI.yml b/.github/workflows/StandardCI.yml
@@ -31,10 +31,10 @@ on:
     - cron: "0 23 * * 2"
 env:
   RG: "AksBicepAcc-Ci-BasicCluster" #The resource group we're deploying to.
-  ParamFilePath: "https://raw.githubusercontent.com/Azure/AKS-Construction/0.10.2/.github/workflows_dep/AksDeploy-Basic.parameters.json" # ".github/workflows_dep/AksDeploy-Basic.parameters.json" #Path to parameter file
+  ParamFilePath: "https://raw.githubusercontent.com/Azure/AKS-Construction/main/.github/workflows_dep/AksDeploy-Basic.parameters.json" # ".github/workflows_dep/AksDeploy-Basic.parameters.json" #Path to parameter file
   RESNAME: "AksStan" #Used in Azure Resource Naming, overrides the default in the parameter file
   DEPNAME: "Dep${{ github.run_number }}" #Deployment Name
-  AZCLIVERSION: 2.43.0 #Pinning to a specific AZ CLI version
+  AZCLIVERSION: 2.53.0 #2.43.0 #2.34.1 #2.29.2 #2.26.0 #latest
 
 permissions:
       id-token: write

diff --git a/.github/workflows/ghpagesTest.yml b/.github/workflows/ghpagesTest.yml
@@ -26,7 +26,7 @@ on:
         required: true
 
 env:
-  AZCLIVERSION: 2.43.0 #2.34.1 #2.29.2 #2.26.0 #latest
+  AZCLIVERSION: 2.53.0 #2.43.0 #2.34.1 #2.29.2 #2.26.0 #latest
 
 jobs:
   Validation:
@@ -102,7 +102,7 @@ jobs:
 
       - name: Html Broken Link Checker
         id: lychee
-        uses: lycheeverse/lychee-action@v1.8.0
+        uses: lycheeverse/lychee-action@v1.7.0
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
         with:

diff --git a/.github/workflows/regressionparams.yml b/.github/workflows/regressionparams.yml
@@ -25,7 +25,7 @@ on:
 env:
   RG: "AksBicepAcc-Ci-HelperValidate" #The resource group we're deploying to.
   ParamDir: ".github/workflows_dep/regressionparams/" #Path to parameter file
-  AZCLIVERSION: 2.43.0 #Pinning to a specific AZ CLI version
+  AZCLIVERSION: 2.53.0 #2.43.0 #2.34.1 #2.29.2 #2.26.0 #latest
 
 jobs:
   GetParamFiles:

diff --git a/bicep/aksagentpool.bicep b/bicep/aksagentpool.bicep
@@ -51,7 +51,7 @@ param autoTaintWindows bool = false
 
 var taints = autoTaintWindows ? union(nodeTaints, ['sku=Windows:NoSchedule']) : nodeTaints
 
-resource aks 'Microsoft.ContainerService/managedClusters@2021-10-01' existing = {
+resource aks 'Microsoft.ContainerService/managedClusters@2023-07-02-preview' existing = {
   name: AksName
 }
 

diff --git a/bicep/main.bicep b/bicep/main.bicep
@@ -1107,6 +1107,7 @@ param serviceMeshProfile string = ''
 
 @description('The ingress gateway to use for the Istio service mesh')
 param istioIngressGatewayMode string = ''
+param istioRevision string = 'asm-1-17'
 
 var serviceMeshProfileObj = {
   istio: {
@@ -1116,6 +1117,9 @@ var serviceMeshProfileObj = {
         mode: istioIngressGatewayMode
       }]
     }
+    revisions: [
+      istioRevision
+    ]
   }
   mode: 'Istio'
 }
@@ -1336,7 +1340,7 @@ keyVaultKmsCreateAndPrereqs || !empty(keyVaultKmsByoKeyId) ? azureKeyVaultKms :
 !empty(serviceMeshProfile) ? { serviceMeshProfile: serviceMeshProfileObj } : {}
 )
 
-resource aks 'Microsoft.ContainerService/managedClusters@2023-05-02-preview' = {
+resource aks 'Microsoft.ContainerService/managedClusters@2023-07-02-preview' = {
   name: 'aks-${resourceName}'
   location: location
   properties: aksProperties