diff --git a/azure_arc_app_services_jumpstart/aks/ARM/aks.json b/azure_arc_app_services_jumpstart/aks/ARM/aks.json index 4f1d401552..9db9a4062c 100644 --- a/azure_arc_app_services_jumpstart/aks/ARM/aks.json +++ b/azure_arc_app_services_jumpstart/aks/ARM/aks.json @@ -103,7 +103,7 @@ }, "resources": [ { - "apiVersion": "2022-02-01", + "apiVersion": "2024-02-02-preview", "type": "Microsoft.ContainerService/managedClusters", "location": "[parameters('location')]", "name": "[parameters('clusterName')]", @@ -130,6 +130,10 @@ "networkProfile": { "networkPlugin": "azure" }, + "autoUpgradeProfile": { + "upgradeChannel": "stable", + "nodeOSUpgradeChannel": "NodeImage" + }, "linuxProfile": { "adminUsername": "[parameters('linuxAdminUsername')]", "ssh": { diff --git a/azure_arc_data_jumpstart/aks/ARM/aks.json b/azure_arc_data_jumpstart/aks/ARM/aks.json index c61af68398..dc9b0f55d1 100644 --- a/azure_arc_data_jumpstart/aks/ARM/aks.json +++ b/azure_arc_data_jumpstart/aks/ARM/aks.json @@ -113,7 +113,7 @@ }, "resources": [ { - "apiVersion": "2022-03-02-preview", + "apiVersion": "2024-02-02-preview", "type": "Microsoft.ContainerService/managedClusters", "location": "[parameters('location')]", "name": "[parameters('clusterName')]", @@ -154,6 +154,10 @@ ] } }, + "autoUpgradeProfile": { + "upgradeChannel": "stable", + "nodeOSUpgradeChannel": "NodeImage" + }, "servicePrincipalProfile": { "clientId": "[parameters('spnClientId')]", "Secret": "[parameters('spnClientSecret')]" diff --git a/azure_arc_data_jumpstart/aks/DR/ARM/aks.json b/azure_arc_data_jumpstart/aks/DR/ARM/aks.json index bd8b907e85..a25c336af7 100644 --- a/azure_arc_data_jumpstart/aks/DR/ARM/aks.json +++ b/azure_arc_data_jumpstart/aks/DR/ARM/aks.json @@ -142,7 +142,7 @@ }, "resources": [ { - "apiVersion": "2022-03-02-preview", + "apiVersion": "2024-02-02-preview", "type": "Microsoft.ContainerService/managedClusters", "location": "[parameters('location')]", "name": "[concat(parameters('clusterName'),'-Primary')]", @@ -183,6 +183,10 @@ ] } }, + "autoUpgradeProfile": { + "upgradeChannel": "stable", + "nodeOSUpgradeChannel": "NodeImage" + }, "servicePrincipalProfile": { "clientId": "[parameters('spnClientId')]", "Secret": "[parameters('spnClientSecret')]" @@ -193,7 +197,7 @@ } }, { - "apiVersion": "2022-03-02-preview", + "apiVersion": "2024-02-02-preview", "type": "Microsoft.ContainerService/managedClusters", "location": "[parameters('location')]", "name": "[concat(parameters('clusterName'),'-Secondary')]", @@ -234,6 +238,10 @@ ] } }, + "autoUpgradeProfile": { + "upgradeChannel": "stable", + "nodeOSUpgradeChannel": "NodeImage" + }, "servicePrincipalProfile": { "clientId": "[parameters('spnClientId')]", "Secret": "[parameters('spnClientSecret')]" diff --git a/azure_arc_data_jumpstart/aks/Migration/ARM/aks.json b/azure_arc_data_jumpstart/aks/Migration/ARM/aks.json index f1c844b887..eb57502f07 100644 --- a/azure_arc_data_jumpstart/aks/Migration/ARM/aks.json +++ b/azure_arc_data_jumpstart/aks/Migration/ARM/aks.json @@ -103,7 +103,7 @@ }, "resources": [ { - "apiVersion": "2022-01-02-preview", + "apiVersion": "2024-02-02-preview", "type": "Microsoft.ContainerService/managedClusters", "location": "[parameters('location')]", "name": "[parameters('clusterName')]", @@ -142,6 +142,10 @@ ] } }, + "autoUpgradeProfile": { + "upgradeChannel": "stable", + "nodeOSUpgradeChannel": "NodeImage" + }, "servicePrincipalProfile": { "clientId": "[parameters('spnClientId')]", "Secret": "[parameters('spnClientSecret')]" diff --git a/azure_arc_k8s_jumpstart/aks/arm_template/azuredeploy.json b/azure_arc_k8s_jumpstart/aks/arm_template/azuredeploy.json index 92d94ca679..4545de327a 100644 --- a/azure_arc_k8s_jumpstart/aks/arm_template/azuredeploy.json +++ b/azure_arc_k8s_jumpstart/aks/arm_template/azuredeploy.json @@ -105,7 +105,7 @@ }, "resources": [ { - "apiVersion": "2022-02-01", + "apiVersion": "2024-02-02-preview", "type": "Microsoft.ContainerService/managedClusters", "location": "[parameters('location')]", "name": "[parameters('clusterName')]", @@ -135,6 +135,10 @@ ] } }, + "autoUpgradeProfile": { + "upgradeChannel": "stable", + "nodeOSUpgradeChannel": "NodeImage" + }, "servicePrincipalProfile": { "clientId": "[parameters('servicePrincipalClientId')]", "Secret": "[parameters('servicePrincipalClientSecret')]" diff --git a/azure_arc_ml_jumpstart/aks/arm_template/aks.json b/azure_arc_ml_jumpstart/aks/arm_template/aks.json index 9b5a3b52da..8aacaa6dd6 100644 --- a/azure_arc_ml_jumpstart/aks/arm_template/aks.json +++ b/azure_arc_ml_jumpstart/aks/arm_template/aks.json @@ -103,7 +103,7 @@ }, "resources": [ { - "apiVersion": "2020-03-01", + "apiVersion": "2024-02-02-preview", "type": "Microsoft.ContainerService/managedClusters", "location": "[parameters('location')]", "name": "[parameters('clusterName')]", @@ -134,6 +134,10 @@ ] } }, + "autoUpgradeProfile": { + "upgradeChannel": "stable", + "nodeOSUpgradeChannel": "NodeImage" + }, "servicePrincipalProfile": { "clientId": "[parameters('spnClientId')]", "Secret": "[parameters('spnClientSecret')]" diff --git a/azure_jumpstart_ag/retail/bicep/kubernetes/aks.bicep b/azure_jumpstart_ag/retail/bicep/kubernetes/aks.bicep index e54098af6c..024b0e4599 100644 --- a/azure_jumpstart_ag/retail/bicep/kubernetes/aks.bicep +++ b/azure_jumpstart_ag/retail/bicep/kubernetes/aks.bicep @@ -67,7 +67,7 @@ param kubernetesVersion string = '1.28.5' var serviceCidr_staging = '10.21.64.0/19' var dnsServiceIP_staging = '10.21.64.10' -resource aksStaging 'Microsoft.ContainerService/managedClusters@2023-05-02-preview' = { +resource aksStaging 'Microsoft.ContainerService/managedClusters@2024-04-02-preview' = { location: location name: aksStagingClusterName tags: resourceTags @@ -102,6 +102,10 @@ resource aksStaging 'Microsoft.ContainerService/managedClusters@2023-05-02-previ enabled: true } } + autoUpgradeProfile: { + upgradeChannel: 'stable' + nodeOSUpgradeChannel: 'NodeImage' + } networkProfile: { networkPlugin: 'azure' serviceCidr: serviceCidr_staging diff --git a/azure_jumpstart_arcbox/ARM/azuredeploy.json b/azure_jumpstart_arcbox/ARM/azuredeploy.json index bbb5d1c28f..9adb41ff3b 100644 --- a/azure_jumpstart_arcbox/ARM/azuredeploy.json +++ b/azure_jumpstart_arcbox/ARM/azuredeploy.json @@ -9099,7 +9099,7 @@ "resources": [ { "type": "Microsoft.ContainerService/managedClusters", - "apiVersion": "2023-10-02-preview", + "apiVersion": "2024-02-02-preview", "name": "[parameters('aksClusterName')]", "location": "[parameters('location')]", "identity": { @@ -9143,12 +9143,16 @@ } ] } + }, + "autoUpgradeProfile": { + "upgradeChannel": "stable", + "nodeOSUpgradeChannel": "NodeImage" } } }, { "type": "Microsoft.ContainerService/managedClusters", - "apiVersion": "2023-10-02-preview", + "apiVersion": "2024-02-02-preview", "name": "[parameters('drClusterName')]", "location": "[parameters('location')]", "identity": { @@ -9192,6 +9196,10 @@ } ] } + }, + "autoUpgradeProfile": { + "upgradeChannel": "stable", + "nodeOSUpgradeChannel": "NodeImage" } } }, diff --git a/azure_jumpstart_arcbox/ARM/kubernetes/aks.json b/azure_jumpstart_arcbox/ARM/kubernetes/aks.json index 59a84038f8..e560372c56 100644 --- a/azure_jumpstart_arcbox/ARM/kubernetes/aks.json +++ b/azure_jumpstart_arcbox/ARM/kubernetes/aks.json @@ -124,7 +124,7 @@ }, "resources": [ { - "apiVersion": "2022-07-02-preview", + "apiVersion": "2024-02-02-preview", "type": "Microsoft.ContainerService/managedClusters", "location": "[parameters('location')]", "name": "[parameters('aksClusterName')]", @@ -151,8 +151,7 @@ "networkProfile": { "networkPlugin": "azure", "serviceCidr": "[variables('serviceCidr-primary')]", - "dnsServiceIP": "[variables('dnsServiceIP-primary')]", - "dockerBridgeCidr": "[variables('dockerBridgeCidr-primary')]" + "dnsServiceIP": "[variables('dnsServiceIP-primary')]" }, "linuxProfile": { "adminUsername": "[parameters('linuxAdminUsername')]", @@ -164,6 +163,10 @@ ] } }, + "autoUpgradeProfile": { + "upgradeChannel": "stable", + "nodeOSUpgradeChannel": "NodeImage" + }, "servicePrincipalProfile": { "clientId": "[parameters('spnClientId')]", "Secret": "[parameters('spnClientSecret')]" @@ -174,7 +177,7 @@ } }, { - "apiVersion": "2022-07-02-preview", + "apiVersion": "2024-02-02-preview", "type": "Microsoft.ContainerService/managedClusters", "location": "[parameters('location')]", "name": "[parameters('drClusterName')]", @@ -201,8 +204,7 @@ "networkProfile": { "networkPlugin": "azure", "serviceCidr": "[variables('serviceCidr-secondary')]", - "dnsServiceIP": "[variables('dnsServiceIP-secondary')]", - "dockerBridgeCidr": "[variables('dockerBridgeCidr-secondary')]" + "dnsServiceIP": "[variables('dnsServiceIP-secondary')]" }, "linuxProfile": { "adminUsername": "[parameters('linuxAdminUsername')]", @@ -214,6 +216,10 @@ ] } }, + "autoUpgradeProfile": { + "upgradeChannel": "stable", + "nodeOSUpgradeChannel": "NodeImage" + }, "servicePrincipalProfile": { "clientId": "[parameters('spnClientId')]", "Secret": "[parameters('spnClientSecret')]" diff --git a/azure_jumpstart_arcbox/bicep/kubernetes/aks.bicep b/azure_jumpstart_arcbox/bicep/kubernetes/aks.bicep index ac931928cb..e8bf53d653 100644 --- a/azure_jumpstart_arcbox/bicep/kubernetes/aks.bicep +++ b/azure_jumpstart_arcbox/bicep/kubernetes/aks.bicep @@ -58,7 +58,7 @@ var aksSubnetName = '${namingPrefix}-AKS-Subnet' var drVirtualNetworkName = '${namingPrefix}-DR-VNet' var drSubnetName = '${namingPrefix}-DR-Subnet' -resource aksClusterName_resource 'Microsoft.ContainerService/managedClusters@2023-10-02-preview' = { +resource aksClusterName_resource 'Microsoft.ContainerService/managedClusters@2024-04-02-preview' = { location: location name: aksClusterName identity: { @@ -93,6 +93,10 @@ resource aksClusterName_resource 'Microsoft.ContainerService/managedClusters@202 serviceCidr: serviceCidr_primary dnsServiceIP: dnsServiceIP_primary } + autoUpgradeProfile: { + nodeOSUpgradeChannel: 'NodeImage' + upgradeChannel: 'stable' + } linuxProfile: { adminUsername: linuxAdminUsername ssh: { @@ -106,7 +110,7 @@ resource aksClusterName_resource 'Microsoft.ContainerService/managedClusters@202 } } -resource drClusterName_resource 'Microsoft.ContainerService/managedClusters@2023-10-02-preview' = { +resource drClusterName_resource 'Microsoft.ContainerService/managedClusters@2024-04-02-preview' = { location: location name: drClusterName identity: { @@ -151,6 +155,10 @@ resource drClusterName_resource 'Microsoft.ContainerService/managedClusters@2023 ] } } + autoUpgradeProfile: { + nodeOSUpgradeChannel: 'NodeImage' + upgradeChannel: 'stable' + } } }