Skip to content

Commit 98c605e

Browse files
Merge pull request #559 from microsoft/dev
fix: merging dev to main
2 parents 2d23299 + 54983ec commit 98c605e

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

Deployment/resourcedeployment.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -791,7 +791,7 @@ try {
791791
foreach ($nodePool in $nodePools) {
792792
Write-Host "Upgrading node pool: $nodePool" -ForegroundColor Cyan
793793
Write-Host "Node pool $nodePool upgrade initiated." -ForegroundColor Green
794-
az aks nodepool upgrade --resource-group $deploymentResult.ResourceGroupName --cluster-name $deploymentResult.AksName --name $nodePool
794+
az aks nodepool upgrade --resource-group $deploymentResult.ResourceGroupName --cluster-name $deploymentResult.AksName --name $nodePool --yes
795795
}
796796
}
797797
catch {

infra/main.bicep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ module managedCluster 'br/public:avm/res/container-service/managed-cluster:0.10.
924924
location: solutionLocation
925925
tags: tags
926926
enableTelemetry: enableTelemetry
927-
kubernetesVersion: '1.32.7'
927+
kubernetesVersion: '1.34.2'
928928
dnsPrefix: 'aks-${solutionSuffix}'
929929
enableRBAC: true
930930
disableLocalAccounts: false

infra/main.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"_generator": {
77
"name": "bicep",
88
"version": "0.40.2.10011",
9-
"templateHash": "8417814553440700358"
9+
"templateHash": "14645128480975829011"
1010
}
1111
},
1212
"parameters": {
@@ -36561,8 +36561,8 @@
3656136561
}
3656236562
},
3656336563
"dependsOn": [
36564-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]",
3656536564
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
36565+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]",
3656636566
"userAssignedIdentity",
3656736567
"virtualNetwork"
3656836568
]
@@ -44130,7 +44130,7 @@
4413044130
"value": "[parameters('enableTelemetry')]"
4413144131
},
4413244132
"kubernetesVersion": {
44133-
"value": "1.32.7"
44133+
"value": "1.34.2"
4413444134
},
4413544135
"dnsPrefix": {
4413644136
"value": "[format('aks-{0}', variables('solutionSuffix'))]"

0 commit comments

Comments
 (0)