Updated regions and VM SKUs available in Helper UI, and changed defau…

…lt SKU selections (#705) * - Updated K8s version to current default - Updated region list to include all current regions - Updated SKU families to include latest v5 and remove oldest v2 - Updated generate-vm-sku-list.sh logic to pick correct storage parameter for ephemeral storage * - Updated default system and user node SKU to use Standard_D4ds_v5 - Updated cost optimised clusters to use Standard_B4s_v2, and performance clusters to Standard_D8ds_v4 - Updated workflows to use current gen VM SKUs Standard_D4ds_v5 * - Changed default node pool names to "agentpool" and "userpool01" to align more closely with the Portal * - Changed default OS disk size to 128 GB (to match portal behaviour) * - Updated default Kubernetes versions in main.bicep and other JSON config files * Adding userpool and agentpool to spell expections * Reverting managedClusters API version * Updated aksOutboundTrafficType from natGateway to managedNatGateway to try and address build issues * Updated aksOutboundTrafficType to loadBalancer to try and address build issues * Changed managedClusters API version to 2023-11-01 * Changed 'natGateway' to 'managedNatGateway' to align with current examples * Changed 'natGateway' to 'managedNATGateway' to align with current API spec * Updated another reference to natGateway Updated workflow to use in-branch version of AksDeploy-Basic.parameters.json isntead of hosted version (which won't be up-to-date with any changes in current branch) * Reverting to 0.10.4 as reverting to API version 2023-11-01 hasn't taken effect as this is pulled from the latest published release rather than in-branch * Enclosing `natGatewayProfile` in `networkProfile` key * Pointing workflow at local parameter file to reflect changes in local branch * Pointing workflow at local parameter file to reflect changes in local branch * Pointing workflow at local parameter file to reflect changes in local branch * Pointing workflow at local parameter file to reflect changes in local branch * Temporarily pointing to this working branch for testing * Reverting to 0.10.5 as 0.10.4 contains a parameter thats been removed from the API * Reverting ParamFile to the file on main branch. This will cause builds to fail until changes in this PR get published. * - Added branch variable to allow workflows to build off current branch for PRs - Reverted AKS API version to 2024-01-01 * - Added branch variable to allow workflows to build off current branch for PRs * - Added branch variable to allow workflows to build off current branch for PRs * - Reverting change from natGateway to managedNATGateway, back to natGateway * - Reverting change from natGateway to managedNATGateway, back to natGateway * - Trying to fix the error about the natGatewayProfile: `unknown field \\\"natGatewayProfile\\\" Check that the field is in the right location, is spelled correctly, and is supported in the API version` * Enclosing `natGatewayProfile` in `networkProfile` key * - Commenting out problematic code for testing * - Changed default outbound type to loadBalancer for pipeline tests - Reverting previous changes to `managedNATGatewayProfile` JSON snippets
Azure · Aug 9, 2024 · 55cebf0 · 55cebf0
1 parent 3d37706
commit 55cebf0
Show file tree

Hide file tree

Showing 39 changed files with 7,915 additions and 1,355 deletions.
diff --git a/.github/workflows/StandardCI.yml b/.github/workflows/StandardCI.yml
@@ -31,7 +31,7 @@ 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/main/.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/${{ github.head_ref || github.ref_name }}/.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.53.0 #2.43.0 #2.34.1 #2.29.2 #2.26.0 #latest

diff --git a/.github/workflows_dep/AksDeploy-Basic.parameters.json b/.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

diff --git a/.github/workflows_dep/AksDeploy-ByoVnet.parameters.json b/.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

diff --git a/.github/workflows_dep/AksDeploy-Private.parameters.json b/.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": "loadBalancer"
           },
           "createNatGateway" : {
               "value": true

diff --git a/.github/workflows_dep/regressionparams/byoKms.json b/.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

diff --git a/.github/workflows_dep/regressionparams/byoKmsPrivateLink.json b/.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

diff --git a/.github/workflows_dep/regressionparams/cilium-cni-overlay.json b/.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"

diff --git a/.github/workflows_dep/regressionparams/classic-custom-vnet-plus-firewall.json b/.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

diff --git a/.github/workflows_dep/regressionparams/dapr.json b/.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

diff --git a/.github/workflows_dep/regressionparams/defender.json b/.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

diff --git a/.github/workflows_dep/regressionparams/edgeK8sVersion.json b/.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"

diff --git a/.github/workflows_dep/regressionparams/gitOps.json b/.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

diff --git a/.github/workflows_dep/regressionparams/managed-private-privatelink.json b/.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

diff --git a/.github/workflows_dep/regressionparams/managed-private.json b/.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

diff --git a/.github/workflows_dep/regressionparams/managed-public.json b/.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

diff --git a/.github/workflows_dep/regressionparams/managedNatGw.json b/.github/workflows_dep/regressionparams/managedNatGw.json
@@ -6,7 +6,7 @@
       "value": "az-k8s-natgw"
     },
     "agentVMSize": {
-      "value": "Standard_DS3_v2"
+      "value": "Standard_D4ds_v5"
     },
     "aksOutboundTrafficType" : {
       "value": "natGateway"

diff --git a/.github/workflows_dep/regressionparams/open-secure.json b/.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

diff --git a/.github/workflows_dep/regressionparams/optimised-for-well-architected.json b/.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

diff --git a/.github/workflows_dep/regressionparams/publicKms.json b/.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

diff --git a/.github/workflows_dep/regressionparams/scale-userpool-from-zero.json b/.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

diff --git a/.github/workflows_dep/regressionparams/simple-simple.json b/.github/workflows_dep/regressionparams/simple-simple.json
@@ -6,7 +6,7 @@
       "value": "az-k8s-7zw4"
     },
     "agentVMSize": {
-      "value": "Standard_DS3_v2"
+      "value": "Standard_D4ds_v5"
     }
   }
 }
diff --git a/.github/workflows_dep/regressionparams/the-cheapest-cluster.json b/.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

diff --git a/bicep/main.bicep b/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
@@ -1128,15 +1128,15 @@ var outboundTrafficType = aksOutboundTrafficType=='natGateway' ? ( custom_vnet ?
 @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'
 
@@ -1377,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)

diff --git a/cspell.json b/cspell.json
@@ -11,6 +11,7 @@
         "aadgroupids",
         "accv",
         "ACRNAME",
+        "agentpool",
         "AGIC",
         "aksc",
         "aksvnetparams",
@@ -138,6 +139,7 @@
         "updatevals",
         "urlname",
         "userauth",
+        "userpool",
         "valres",
         "vaultname",
         "VNET",

diff --git a/helper/src/components/clusterTab.js b/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)}

diff --git a/helper/src/config.json b/helper/src/config.json
@@ -10,8 +10,8 @@
         "deploy": {
             "enableTelemetry": true,
             "managedNodeResourceGroup": "",
-            "kubernetesVersion": "1.28.5",
-            "location": "WestEurope",
+            "kubernetesVersion": "1.29.7",
+            "location": "westeurope",
             "apiips": "",
             "demoapp": false,
             "disablePreviews": false,
@@ -44,13 +44,13 @@
             "osSKU": "Ubuntu",
             "upgradeChannel": "none",
             "SystemPoolType": "CostOptimised",
-            "nodepoolName": "npuser01",
-            "systemNodepoolName": "npsystem",
+            "nodepoolName": "userpool01",
+            "systemNodepoolName": "agentpool",
             "agentCount": 3,
             "maxCount": 20,
             "computeType": "gp",
-            "vmSize": "Standard_DS3_v2",
-            "osDiskSizeGB": 30,
+            "vmSize": "Standard_D4ds_v5",
+            "osDiskSizeGB": 128,
             "osDiskType": "Ephemeral",
             "enable_aad": true,
             "AksDisableLocalAccounts": false,

diff --git a/helper/src/configpresets/gaming.json b/helper/src/configpresets/gaming.json
@@ -68,7 +68,7 @@
                                 "AksPaidSkuForSLA" : false,
                                 "agentCount": 1,
                                 "upgradeChannel": "stable",
-                                "vmSize" : "Standard_B2ms",
+                                "vmSize" : "Standard_B2s_v2",
                                 "osDiskType" : "Managed",
                                 "nodepoolName" : "minecraft",
                                 "SystemPoolType" : "none"

diff --git a/helper/src/configpresets/principals.json b/helper/src/configpresets/principals.json
@@ -455,7 +455,7 @@
                                 "AksPaidSkuForSLA": true,
                                 "availabilityZones": "yes",
                                 "agentCount": 3,
-                                "agentVMSize": "Standard_DS3_v2",
+                                "agentVMSize": "Standard_D4ds_v4",
                                 "osDiskType" : "Ephemeral"
                             },
                             "addons": {