Updated regions and VM SKUs available in Helper UI, and changed default SKU selections

.github/workflows_dep/AksDeploy-Basic.parameters.json

@@ -15,7 +15,7 @@
             "value": 1
         },
         "agentVMSize": {
-            "value": "Standard_DS3_v2"
+            "value": "Standard_D4ds_v5"
         },
         "enable_aad": {
             "value": true
@@ -39,7 +39,7 @@
             "value": "Standard"
         },
         "aksOutboundTrafficType" : {
-            "value": "natGateway"
+            "value": "loadBalancer"
         }
     }
 }

.github/workflows_dep/AksDeploy-ByoVnet.parameters.json

@@ -12,7 +12,7 @@
             "value": 1
         },
         "agentVMSize": {
-            "value": "Standard_DS3_v2"
+            "value": "Standard_D4ds_v5"
         },
         "agentCountMax": {
             "value": 2

.github/workflows_dep/AksDeploy-Private.parameters.json

@@ -9,7 +9,7 @@
             "value": "priv"
           },
           "agentVMSize": {
-            "value": "Standard_DS3_v2"
+            "value": "Standard_D4ds_v5"
           },
           "agentCountMax": {
               "value": 2
@@ -93,7 +93,7 @@
             "value": true
           },
           "aksOutboundTrafficType" : {
-              "value": "natGateway"
+              "value": "managedNATGateway"
           },
           "createNatGateway" : {
               "value": true

.github/workflows_dep/regressionparams/byoKms.json

@@ -6,7 +6,7 @@
         "value": "az-k8s-kmsbyopub"
       },
       "agentVMSize": {
-        "value": "Standard_DS3_v2"
+        "value": "Standard_D4ds_v5"
       },
       "JustUseSystemPool": {
         "value": true

.github/workflows_dep/regressionparams/byoKmsPrivateLink.json

@@ -6,7 +6,7 @@
         "value": "az-k8s-kmsbyopl"
       },
       "agentVMSize": {
-        "value": "Standard_DS3_v2"
+        "value": "Standard_D4ds_v5"
       },
       "JustUseSystemPool": {
         "value": true

.github/workflows_dep/regressionparams/cilium-cni-overlay.json

@@ -9,7 +9,7 @@
       "value": "WestCentralUs"
     },
     "agentVMSize": {
-      "value": "Standard_DS3_v2"
+      "value": "Standard_D4ds_v5"
     },
     "networkDataplane": {
       "value": "cilium"

.github/workflows_dep/regressionparams/classic-custom-vnet-plus-firewall.json

@@ -9,7 +9,7 @@
 			"value": 1
 		},
 		"agentVMSize": {
-			"value": "Standard_DS3_v2"
+			"value": "Standard_D4ds_v5"
 		},
 		"agentCountMax": {
 			"value": 3

.github/workflows_dep/regressionparams/dapr.json

@@ -6,7 +6,7 @@
             "value": "az-k8s-dapr"
         },
         "agentVMSize": {
-            "value": "Standard_DS3_v2"
+            "value": "Standard_D4ds_v5"
         },
         "daprAddon": {
             "value": true

.github/workflows_dep/regressionparams/defender.json

@@ -10,7 +10,7 @@
             "value": "az-k8s-def"
           },
           "agentVMSize": {
-            "value": "Standard_DS3_v2"
+            "value": "Standard_D4ds_v5"
           },
           "agentCountMax": {
             "value": 3

.github/workflows_dep/regressionparams/edgeK8sVersion.json

@@ -6,7 +6,7 @@
       "value": "az-k8s-edged"
     },
     "agentVMSize": {
-      "value": "Standard_DS3_v2"
+      "value": "Standard_D4ds_v5"
     },
     "kubernetesVersion": {
       "value": "1.26.3"

.github/workflows_dep/regressionparams/gitOps.json

@@ -6,7 +6,7 @@
       "value": "az-k8s-flux"
     },
     "agentVMSize": {
-      "value": "Standard_DS3_v2"
+      "value": "Standard_D4ds_v5"
     },
     "fluxGitOpsAddon": {
       "value": true

.github/workflows_dep/regressionparams/managed-private-privatelink.json

@@ -9,7 +9,7 @@
       "value": 1
     },
     "agentVMSize": {
-      "value": "Standard_DS3_v2"
+      "value": "Standard_D4ds_v5"
     },
     "agentCountMax": {
       "value": 5

.github/workflows_dep/regressionparams/managed-private.json

@@ -6,7 +6,7 @@
       "value": "az-k8s-3zb3"
     },
     "agentVMSize": {
-      "value": "Standard_DS3_v2"
+      "value": "Standard_D4ds_v5"
     },
     "agentCountMax": {
       "value": 20

.github/workflows_dep/regressionparams/managed-public.json

@@ -6,7 +6,7 @@
       "value": "manpub"
     },
     "agentVMSize": {
-      "value": "Standard_DS3_v2"
+      "value": "Standard_D4ds_v5"
     },
     "agentCountMax": {
       "value": 1

.github/workflows_dep/regressionparams/managedNatGw.json

@@ -6,10 +6,10 @@
       "value": "az-k8s-natgw"
     },
     "agentVMSize": {
-      "value": "Standard_DS3_v2"
+      "value": "Standard_D4ds_v5"
     },
     "aksOutboundTrafficType" : {
-      "value": "natGateway"
+      "value": "managedNATGateway"
     },
     "natGwIpCount" : {
       "value": 3

.github/workflows_dep/regressionparams/open-secure.json

@@ -6,7 +6,7 @@
       "value": "az-k8s-4chu"
     },
     "agentVMSize": {
-      "value": "Standard_DS3_v2"
+      "value": "Standard_D4ds_v5"
     },
     "custom_vnet": {
       "value": true

.github/workflows_dep/regressionparams/optimised-for-well-architected.json

@@ -13,7 +13,7 @@
             "value": "Standard"
           },
           "agentVMSize": {
-            "value": "Standard_DS3_v2"
+            "value": "Standard_D4ds_v5"
           },
           "agentCountMax": {
             "value": 20

.github/workflows_dep/regressionparams/publicKms.json

@@ -6,7 +6,7 @@
         "value": "az-k8s-kmspp1"
       },
       "agentVMSize": {
-        "value": "Standard_DS3_v2"
+        "value": "Standard_D4ds_v5"
       },
       "JustUseSystemPool": {
         "value": true

.github/workflows_dep/regressionparams/scale-userpool-from-zero.json

@@ -9,7 +9,7 @@
       "value": 0
     },
     "agentVMSize": {
-      "value": "Standard_DS3_v2"
+      "value": "Standard_D4ds_v5"
     },
     "agentCountMax": {
       "value": 3

.github/workflows_dep/regressionparams/simple-simple.json

@@ -6,7 +6,7 @@
       "value": "az-k8s-7zw4"
     },
     "agentVMSize": {
-      "value": "Standard_DS3_v2"
+      "value": "Standard_D4ds_v5"
     }
   }
 }

.github/workflows_dep/regressionparams/the-cheapest-cluster.json

@@ -9,7 +9,7 @@
       "value": 1
     },
     "agentVMSize": {
-      "value": "Standard_B2ms"
+      "value": "Standard_B2s_v2"
     },
     "agentCountMax": {
       "value": 2

bicep/aksagentpool.bicep

@@ -63,11 +63,11 @@ var spotProperties = {
 // Default OS Disk Size in GB for Linux is 30, for Windows is 100
 var defaultOsDiskSizeGB = osType == 'Linux' ? 30 : 100
 
-resource aks 'Microsoft.ContainerService/managedClusters@2024-01-01' existing = {
+resource aks 'Microsoft.ContainerService/managedClusters@2023-11-01' existing = {
   name: AksName
 }
 
-resource userNodepool 'Microsoft.ContainerService/managedClusters/agentPools@2024-01-01' = {
+resource userNodepool 'Microsoft.ContainerService/managedClusters/agentPools@2023-11-01' = {
   parent: aks
   name: PoolName
   properties: union({

bicep/automationrunbook/aksRbac.bicep

@@ -1,7 +1,7 @@
 param principalId string
 param aksName string
 
-resource aks 'Microsoft.ContainerService/managedClusters@2024-01-01' existing = {
+resource aks 'Microsoft.ContainerService/managedClusters@2023-11-01' existing = {
   name: aksName
 }
 

bicep/main.bicep

@@ -851,7 +851,7 @@ output ApplicationGatewayName string = deployAppGw ? appgw.name : ''
 param dnsPrefix string = '${resourceName}-dns'
 
 @description('Kubernetes Version')
-param kubernetesVersion string = '1.28.5'
+param kubernetesVersion string = '1.29.7'
 
 @description('Enable Azure AD integration on AKS')
 param enable_aad bool = false
@@ -904,7 +904,7 @@ param upgradeChannel string = 'none'
 param osDiskType string = 'Ephemeral'
 
 @description('VM SKU')
-param agentVMSize string = 'Standard_DS3_v2'
+param agentVMSize string = 'Standard_D4ds_v5'
 
 @description('Disk size in GB')
 param osDiskSizeGB int = 0
@@ -919,7 +919,7 @@ var autoScale = agentCountMax > agentCount
 @minLength(3)
 @maxLength(12)
 @description('Name for user node pool')
-param nodePoolName string = 'npuser01'
+param nodePoolName string = 'userpool01'
 
 @description('Config the user node pool as a spot instance')
 param nodePoolSpot bool = false
@@ -1057,7 +1057,7 @@ param AutoscaleProfile object = {
 
 @allowed([
   'loadBalancer'
-  'natGateway'
+  'managedNATGateway'
   'userDefinedRouting'
 ])
 @description('Outbound traffic type for the egress traffic of your cluster')
@@ -1123,20 +1123,20 @@ var serviceMeshProfileObj = {
 }
 
 @description('This resolves the friendly natGateway to the actual outbound traffic type value used by AKS')
-var outboundTrafficType = aksOutboundTrafficType=='natGateway' ? ( custom_vnet ? 'userAssignedNATGateway' : 'managedNATGateway' )  : aksOutboundTrafficType
+var outboundTrafficType = aksOutboundTrafficType=='managedNATGateway' ? ( custom_vnet ? 'userAssignedNATGateway' : 'managedNATGateway' )  : aksOutboundTrafficType
 
 @description('System Pool presets are derived from the recommended system pool specs')
 var systemPoolPresets = {
   CostOptimised : {
-    vmSize: 'Standard_B4ms'
+    vmSize: 'Standard_B4s_v2'
     count: 1
     minCount: 1
     maxCount: 3
     enableAutoScaling: true
     availabilityZones: []
   }
   Standard : {
-    vmSize: 'Standard_DS2_v2'
+    vmSize: 'Standard_D4ds_v5'
     count: 3
     minCount: 3
     maxCount: 5
@@ -1148,7 +1148,7 @@ var systemPoolPresets = {
     ]
   }
   HighSpec : {
-    vmSize: 'Standard_D4s_v3'
+    vmSize: 'Standard_D8ds_v4'
     count: 3
     minCount: 3
     maxCount: 5
@@ -1162,7 +1162,7 @@ var systemPoolPresets = {
 }
 
 var systemPoolBase = {
-  name:  JustUseSystemPool ? nodePoolName : 'npsystem'
+  name:  JustUseSystemPool ? nodePoolName : 'agentpool'
   vmSize: agentVMSize
   count: agentCount
   mode: 'System'
@@ -1183,7 +1183,7 @@ var systemPoolBase = {
 var agentPoolProfiles = JustUseSystemPool ? array(systemPoolBase) : concat(array(union(systemPoolBase, SystemPoolType=='Custom' && SystemPoolCustomPreset != {} ? SystemPoolCustomPreset : systemPoolPresets[SystemPoolType])))
 
 output userNodePoolName string = nodePoolName
-output systemNodePoolName string = JustUseSystemPool ? nodePoolName : 'npsystem'
+output systemNodePoolName string = JustUseSystemPool ? nodePoolName : 'agentpool'
 
 var akssku = AksPaidSkuForSLA ? 'Standard' : 'Free'
 
@@ -1244,11 +1244,13 @@ output aksPrivateDnsZoneName string =  enablePrivateCluster && privateClusterDns
 
 @description('Needing to seperately declare and union this because of https://github.com/Azure/AKS-Construction/issues/344')
 var managedNATGatewayProfile =  {
-  natGatewayProfile : {
-    managedOutboundIPProfile: {
-      count: natGwIpCount
+  networkProfile: {
+    natGatewayProfile : {
+      managedOutboundIPProfile: {
+        count: natGwIpCount
+      }
+      idleTimeoutInMinutes: natGwIdleTimeout
     }
-    idleTimeoutInMinutes: natGwIdleTimeout
   }
 }
 
@@ -1335,7 +1337,7 @@ keyVaultKmsCreateAndPrereqs || !empty(keyVaultKmsByoKeyId) ? azureKeyVaultKms :
 !empty(serviceMeshProfile) ? { serviceMeshProfile: serviceMeshProfileObj } : {}
 )
 
-resource aks 'Microsoft.ContainerService/managedClusters@2024-01-01' = {
+resource aks 'Microsoft.ContainerService/managedClusters@2023-11-01' = {
   name: 'aks-${resourceName}'
   location: location
   properties: aksProperties
@@ -1375,7 +1377,7 @@ param osSKU string = 'Ubuntu'
 var poolName = osType == 'Linux' ? nodePoolName : take(nodePoolName, 6)
 
 // Default OS Disk Size in GB for Linux is 30, for Windows is 100
-var defaultOsDiskSizeGB = osType == 'Linux' ? 30 : 100
+var defaultOsDiskSizeGB = 128
 
 module userNodePool '../bicep/aksagentpool.bicep' = if (!JustUseSystemPool){
   name: take('${deployment().name}-userNodePool',64)

cspell.json

@@ -11,6 +11,7 @@
         "aadgroupids",
         "accv",
         "ACRNAME",
+        "agentpool",
         "AGIC",
         "aksc",
         "aksvnetparams",
@@ -138,6 +139,7 @@
         "updatevals",
         "urlname",
         "userauth",
+        "userpool",
         "valres",
         "vaultname",
         "VNET",

helper/.playwrighttests/helper-test-managednatgw.spec.js

@@ -37,7 +37,7 @@ test('managed-natgw-option-is-now-the-prod-default', async ({ page }) => {
   await page.waitForSelector('[data-testid="deploy-deploycmd"]')
   const clitextbox = await page.$('[data-testid="deploy-deploycmd"]')
   await expect(clitextbox).toBeVisible()
-  await expect(clitextbox).not.toContainText('natGateway')
+  await expect(clitextbox).not.toContainText('managedNATGateway')
 
 });
 

helper/src/components/clusterTab.js

@@ -33,7 +33,7 @@ export default function ({ defaults, tabValues, updateFn, featureFlag, invalidAr
             console.log (`maxCount=${newp.maxCount} MIN=${MAXCOUNT_MIN}`)
 
             if(newp.SystemPoolType!=='none' && !cluster.nodepoolName){
-                cluster.nodepoolName = 'npuser01'
+                cluster.nodepoolName = 'userpool01'
             }
 
             if (newp.maxCount < MAXCOUNT_MIN) {
@@ -165,7 +165,7 @@ export default function ({ defaults, tabValues, updateFn, featureFlag, invalidAr
                         onChange={(val, range) => sliderUpdateFn(cluster.autoscale ? {agentCount: range[0], maxCount: range[1]} : {agentCount: val})} />
 
                         <TextField
-                        placeholder='npuser01'
+                        placeholder='userpool01'
                         label="Node pool name"
                         maxLength={cluster.osType==='Windows' ? 6 : 12}
                         onChange={(ev, val) => updateFn('nodepoolName', val)}