From 94ff525e7945b59a50bc056d62a71d83759449ec Mon Sep 17 00:00:00 2001 From: Rafi-Microsoft Date: Fri, 27 Feb 2026 15:51:52 +0530 Subject: [PATCH 1/4] aks version update --- Deployment/resourcedeployment.ps1 | 2 +- infra/main.bicep | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Deployment/resourcedeployment.ps1 b/Deployment/resourcedeployment.ps1 index 9919ba9a..fcbe4cd2 100644 --- a/Deployment/resourcedeployment.ps1 +++ b/Deployment/resourcedeployment.ps1 @@ -788,7 +788,7 @@ try { foreach ($nodePool in $nodePools) { Write-Host "Upgrading node pool: $nodePool" -ForegroundColor Cyan Write-Host "Node pool $nodePool upgrade initiated." -ForegroundColor Green - az aks nodepool upgrade --resource-group $deploymentResult.ResourceGroupName --cluster-name $deploymentResult.AksName --name $nodePool + az aks nodepool upgrade --resource-group $deploymentResult.ResourceGroupName --cluster-name $deploymentResult.AksName --name $nodePool --yes } } catch { diff --git a/infra/main.bicep b/infra/main.bicep index a94bb90f..0850dfa1 100644 --- a/infra/main.bicep +++ b/infra/main.bicep @@ -924,7 +924,7 @@ module managedCluster 'br/public:avm/res/container-service/managed-cluster:0.10. location: solutionLocation tags: tags enableTelemetry: enableTelemetry - kubernetesVersion: '1.32.7' + kubernetesVersion: '1.34.2' dnsPrefix: 'aks-${solutionSuffix}' enableRBAC: true disableLocalAccounts: false From c17a98238199c638af8bdd5e321951b8ec0e17af Mon Sep 17 00:00:00 2001 From: Rafi-Microsoft Date: Fri, 27 Feb 2026 16:49:10 +0530 Subject: [PATCH 2/4] added secondary location as per AVM module --- infra/main.bicep | 6 +++++- infra/main.json | 14 +++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/infra/main.bicep b/infra/main.bicep index 0850dfa1..8140a082 100644 --- a/infra/main.bicep +++ b/infra/main.bicep @@ -9,6 +9,10 @@ param solutionName string = 'kmgs' @description('Optional. Azure location for the solution. If not provided, it defaults to the resource group location.') param location string = '' +@minLength(3) +@description('Optional. Secondary location for databases creation.') +param secondaryLocation string = 'uksouth' + @maxLength(5) @description('Optional. A unique token for the solution. This is used to ensure resource names are unique for global resources. Defaults to a 5-character substring of the unique string generated from the subscription ID, resource group name, and solution name.') param solutionUniqueToken string = substring(uniqueString(subscription().id, resourceGroup().name, solutionName), 0, 5) @@ -138,7 +142,7 @@ var replicaRegionPairs = { uksouth: 'westeurope' westeurope: 'northeurope' } -var replicaLocation = replicaRegionPairs[solutionLocation] +var replicaLocation = replicaRegionPairs[?solutionLocation] ?? secondaryLocation // Region pairs list based on article in [Azure Database for MySQL Flexible Server - Azure Regions](https://learn.microsoft.com/azure/mysql/flexible-server/overview#azure-regions) for supported high availability regions for CosmosDB. var cosmosDbZoneRedundantHaRegionPairs = { diff --git a/infra/main.json b/infra/main.json index 85857e3c..a985bdf8 100644 --- a/infra/main.json +++ b/infra/main.json @@ -6,7 +6,7 @@ "_generator": { "name": "bicep", "version": "0.40.2.10011", - "templateHash": "8417814553440700358" + "templateHash": "454231766837079804" } }, "parameters": { @@ -26,6 +26,14 @@ "description": "Optional. Azure location for the solution. If not provided, it defaults to the resource group location." } }, + "secondaryLocation": { + "type": "string", + "defaultValue": "uksouth", + "minLength": 3, + "metadata": { + "description": "Optional. Secondary location for databases creation." + } + }, "solutionUniqueToken": { "type": "string", "defaultValue": "[substring(uniqueString(subscription().id, resourceGroup().name, parameters('solutionName')), 0, 5)]", @@ -207,7 +215,7 @@ "uksouth": "westeurope", "westeurope": "northeurope" }, - "replicaLocation": "[variables('replicaRegionPairs')[variables('solutionLocation')]]", + "replicaLocation": "[coalesce(tryGet(variables('replicaRegionPairs'), variables('solutionLocation')), parameters('secondaryLocation'))]", "cosmosDbZoneRedundantHaRegionPairs": { "australiaeast": "uksouth", "centralus": "eastus2", @@ -44130,7 +44138,7 @@ "value": "[parameters('enableTelemetry')]" }, "kubernetesVersion": { - "value": "1.32.7" + "value": "1.34.2" }, "dnsPrefix": { "value": "[format('aks-{0}', variables('solutionSuffix'))]" From 207920503823093ae97db6e192bdd525e97f2e18 Mon Sep 17 00:00:00 2001 From: Rafi-Microsoft Date: Mon, 2 Mar 2026 12:53:19 +0530 Subject: [PATCH 3/4] Revert "added secondary location as per AVM module" This reverts commit c17a98238199c638af8bdd5e321951b8ec0e17af. --- infra/main.bicep | 6 +----- infra/main.json | 14 +++----------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/infra/main.bicep b/infra/main.bicep index 8140a082..0850dfa1 100644 --- a/infra/main.bicep +++ b/infra/main.bicep @@ -9,10 +9,6 @@ param solutionName string = 'kmgs' @description('Optional. Azure location for the solution. If not provided, it defaults to the resource group location.') param location string = '' -@minLength(3) -@description('Optional. Secondary location for databases creation.') -param secondaryLocation string = 'uksouth' - @maxLength(5) @description('Optional. A unique token for the solution. This is used to ensure resource names are unique for global resources. Defaults to a 5-character substring of the unique string generated from the subscription ID, resource group name, and solution name.') param solutionUniqueToken string = substring(uniqueString(subscription().id, resourceGroup().name, solutionName), 0, 5) @@ -142,7 +138,7 @@ var replicaRegionPairs = { uksouth: 'westeurope' westeurope: 'northeurope' } -var replicaLocation = replicaRegionPairs[?solutionLocation] ?? secondaryLocation +var replicaLocation = replicaRegionPairs[solutionLocation] // Region pairs list based on article in [Azure Database for MySQL Flexible Server - Azure Regions](https://learn.microsoft.com/azure/mysql/flexible-server/overview#azure-regions) for supported high availability regions for CosmosDB. var cosmosDbZoneRedundantHaRegionPairs = { diff --git a/infra/main.json b/infra/main.json index a985bdf8..85857e3c 100644 --- a/infra/main.json +++ b/infra/main.json @@ -6,7 +6,7 @@ "_generator": { "name": "bicep", "version": "0.40.2.10011", - "templateHash": "454231766837079804" + "templateHash": "8417814553440700358" } }, "parameters": { @@ -26,14 +26,6 @@ "description": "Optional. Azure location for the solution. If not provided, it defaults to the resource group location." } }, - "secondaryLocation": { - "type": "string", - "defaultValue": "uksouth", - "minLength": 3, - "metadata": { - "description": "Optional. Secondary location for databases creation." - } - }, "solutionUniqueToken": { "type": "string", "defaultValue": "[substring(uniqueString(subscription().id, resourceGroup().name, parameters('solutionName')), 0, 5)]", @@ -215,7 +207,7 @@ "uksouth": "westeurope", "westeurope": "northeurope" }, - "replicaLocation": "[coalesce(tryGet(variables('replicaRegionPairs'), variables('solutionLocation')), parameters('secondaryLocation'))]", + "replicaLocation": "[variables('replicaRegionPairs')[variables('solutionLocation')]]", "cosmosDbZoneRedundantHaRegionPairs": { "australiaeast": "uksouth", "centralus": "eastus2", @@ -44138,7 +44130,7 @@ "value": "[parameters('enableTelemetry')]" }, "kubernetesVersion": { - "value": "1.34.2" + "value": "1.32.7" }, "dnsPrefix": { "value": "[format('aks-{0}', variables('solutionSuffix'))]" From 2106924278ab2067e1bfde25d858f4f0541f27a4 Mon Sep 17 00:00:00 2001 From: Rafi-Microsoft Date: Mon, 2 Mar 2026 12:54:20 +0530 Subject: [PATCH 4/4] updated main.json --- infra/main.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/infra/main.json b/infra/main.json index 85857e3c..c6ae2903 100644 --- a/infra/main.json +++ b/infra/main.json @@ -6,7 +6,7 @@ "_generator": { "name": "bicep", "version": "0.40.2.10011", - "templateHash": "8417814553440700358" + "templateHash": "14645128480975829011" } }, "parameters": { @@ -36561,8 +36561,8 @@ } }, "dependsOn": [ - "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]", "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]", + "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]", "userAssignedIdentity", "virtualNetwork" ] @@ -44130,7 +44130,7 @@ "value": "[parameters('enableTelemetry')]" }, "kubernetesVersion": { - "value": "1.32.7" + "value": "1.34.2" }, "dnsPrefix": { "value": "[format('aks-{0}', variables('solutionSuffix'))]"