Updated regions and VM SKUs available in Helper UI, and changed default 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
2024-08-09 19:57:17 +01:00 · 2024-08-09 19:57:17 +01:00 · 55cebf0622
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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"
--- 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
--- 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
--- 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
--- 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"
--- 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
--- 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
--- 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
--- 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
--- 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"
--- 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
--- 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
--- 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
--- 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
--- 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"
    }
  }
 }
--- 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
--- 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,7 +1128,7 @@ 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
@ -1136,7 +1136,7 @@ var systemPoolPresets = {
    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)
--- 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",
--- 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)}
--- 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,
--- 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"
--- 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": {
--- a/helper/src/locations.json
+++ b/helper/src/locations.json
@ -1,19 +1,62 @@
 [
+    { "key": "africa", "text": "Africa", "itemType": 2 },
+    { "key": "southafricanorth", "text": "South Africa North" },
+    { "key": "southafricawest", "text": "South Africa West" },
+
+    { "key": "asiapacific", "text": "Asia Pacific", "itemType": 2 },
+    { "key": "eastasia", "text": "East Asia" },
+    { "key": "southeastasia", "text": "Southeast Asia" },
+    { "key": "australiacentral", "text": "Australia Central" },
+    { "key": "australiacentral2", "text": "Australia Central 2" },
+    { "key": "australiaeast", "text": "Australia East" },
+    { "key": "australiasoutheast", "text": "Australia Southeast" },
+    { "key": "centralindia", "text": "Central India" },
+    { "key": "southindia", "text": "South India" },
+    { "key": "westindia", "text": "West India" },
+    { "key": "japaneast", "text": "Japan East" },
+    { "key": "japanwest", "text": "Japan West" },
+    { "key": "koreacentral", "text": "Korea Central" },
+    { "key": "koreasouth", "text": "Korea South" },
+
    { "key": "europe", "text": "Europe", "itemType": 2},
-    { "key": "WestEurope", "text": "West Europe"},
-    { "key": "NorthEurope", "text": "North Europe"},
-    { "key": "UKSouth", "text": "UK South"},
-    { "key": "UKWest", "text": "UK West" },
+    { "key": "northeurope", "text": "North Europe"},
+    { "key": "westeurope", "text": "West Europe"},
+    { "key": "francecentral", "text": "France Central"},
+    { "key": "francesouth", "text": "France South"},
+    { "key": "germanynorth", "text": "Germany North"},
+    { "key": "germanywestcentral", "text": "Germany West Central"},
+    { "key": "italynorth", "text": "Italy North"},
+    { "key": "norwayeast", "text": "Norway East"},
+    { "key": "norwaywest", "text": "Norway West"},
+    { "key": "polandcentral", "text": "Poland Central"},
+    { "key": "spaincentral", "text": "Spain Central" },
+    { "key": "swedencentral", "text": "Sweden Central" },
+    { "key": "switzerlandnorth", "text": "Switzerland North" },
+    { "key": "switzerlandswest", "text": "Switzerland West" },
+    { "key": "uksouth", "text": "UK South"},
+    { "key": "ukwest", "text": "UK West" },
+
+    { "key": "northamerica", "text": "North America", "itemType": 2 },
+    { "key": "canadacentral", "text": "Canada Central" },
+    { "key": "canadaeast", "text": "Canada East" },
+    { "key": "centralus", "text": "Central US" },
+    { "key": "eastus", "text": "East US" },
+    { "key": "eastus2", "text": "East US 2" },
+    { "key": "mexicocentral", "text": "Mexico Central" },
+    { "key": "northcentralus", "text": "North Central US" },
+    { "key": "southcentralus", "text": "South Central US" },
+    { "key": "westcentralus", "text": "West Central US" },
+    { "key": "westus", "text": "West US" },
+    { "key": "westus2", "text": "West US 2" },
+    { "key": "westus3", "text": "West US 3" },
+
    { "key": "middleeast", "text": "Middle East", "itemType": 2 },
-    { "key": "UAENorth", "text": "UAE North" },
-    { "key": "america", "text": "North America", "itemType": 2 },
-    { "key": "CentralUS", "text": "Central US" },
-    { "key": "EastUS", "text": "East US" },
-    { "key": "EastUS2", "text": "East US2" },
-    { "key": "WestUS", "text": "West US" },
-    { "key": "WestUS2", "text": "West US2" },
-    { "key": "WestCentralUS", "text": "West Central US" },
-    { "key": "canada", "text": "Canada", "itemType": 2 },
-    { "key": "CanadaCentral", "text": "Canada Central" },
-    { "key": "CanadaEast", "text": "Canada East" }
-    ]
+    { "key": "uaecentral", "text": "UAE Central" },
+    { "key": "uaenorth", "text": "UAE North" },
+    { "key": "israelcentral", "text": "Israel Central" },
+    { "key": "qatarcentral", "text": "Qatar Central" },
+
+    { "key": "southamerica", "text": "South America", "itemType": 2 },
+    { "key": "brazilsouth", "text": "Brazil South" },
+    { "key": "brazilsoutheast", "text": "Brazil Southeast" }
+]
--- a/helper/src/skuFamilies.json
+++ b/helper/src/skuFamilies.json
@ -1,8 +1,8 @@
 [
-    {"key": "standardDSv2Family", "text": "General Purpose V2", "computeType": "gp"},
-    {"key": "standardDSv3Family", "text": "General Purpose V3", "computeType": "gp"},
-    {"key": "standardDDSv4Family", "text": "General Purpose V4", "computeType": "gp"},
-    {"key": "standardFSv2Family", "text": "Compute Optimized","computeType": "gp"},
-    {"key": "standardBSFamily", "text": "Burstable (dev/test)","computeType": "gp"},
-    {"key": "standardDCSv3Family", "text": "Confidential v3","computeType": "sgx"}
+    {"key": "standardDSv3Family", "text": "General Purpose v3", "computeType": "gp"},
+    {"key": "standardDDSv4Family", "text": "General Purpose v4", "computeType": "gp"},
+    {"key": "standardDDSv5Family", "text": "General Purpose v5", "computeType": "gp"},
+    {"key": "standardFSv2Family", "text": "Compute Optimized", "computeType": "gp"},
+    {"key": "standardBsv2Family", "text": "Burstable v2 (dev/test)", "computeType": "gp"},
+    {"key": "standardDCSv3Family", "text": "Confidential v3", "computeType": "sgx"}
 ]
--- a/helper/src/vmSKUs.json
+++ b/helper/src/vmSKUs.json
--- a/postdeploy/scripts/generate-vm-sku-list-v2.sh
+++ b/postdeploy/scripts/generate-vm-sku-list-v2.sh
@ -66,11 +66,18 @@ for loc in $(echo "${locations}" | jq -r '.[] | @base64'); do
                    name=$(_jq '.name')
                    osSize=$(echo $(_jq) | jq -r     '.capabilities | .[] | select(.name=="OSVhdSizeMB") | .value')
                    ram=$(echo $(_jq) | jq -r        '.capabilities | .[] | select(.name=="MemoryGB") | .value')
-                    cachedSize=$(echo $(_jq) | jq -r '.capabilities | .[] | select(.name=="CachedDiskBytes") | .value')
+                    cacheStorage=$(echo $(_jq) | jq -r '.capabilities | .[] | select(.name=="CachedDiskBytes") | .value')
+                    cacheStorage_GB=$(( cacheStorage/1073741824 ))
+                    tempStorage=$(echo $(_jq) | jq -r '.capabilities | .[] | select(.name=="MaxResourceVolumeMB") | .value')
+                    tempStorage_GB=$(( tempStorage/1024 ))
+                    if [ $cacheStorage_GB -gt $tempStorage_GB ]; then
+                        cacheGB=$cacheStorage_GB
+                    else
+                        cacheGB=$tempStorage_GB
+                    fi

                    #Convert to GB
                    osSizeGB=$(( osSize/1024 ))
-                    cacheGB=$(( cachedSize/1073741824 ))

                    #Build text property
                    cacheGB=$((cacheGB + 0))
@ -80,7 +87,7 @@ for loc in $(echo "${locations}" | jq -r '.[] | @base64'); do
                        eph=false
                    else
                        iops=$(echo $(_jq) | jq -r       '.capabilities | .[] | select(.name=="CombinedTempDiskAndCachedIOPS") | .value')
-                        cache=", $cacheGB cache ($iops IOPS)"
+                        cache=", $cacheGB GB cache ($iops IOPS)"
                        if [ $cacheGB -ge $ephMinCacheSizeGB ];
                        then
                            eph=true
@ -88,7 +95,7 @@ for loc in $(echo "${locations}" | jq -r '.[] | @base64'); do
                            eph=false
                        fi
                    fi
-                    text="[$name]: $cpu vCPU, $ram RAM, $osSizeGB SSD $cache"
+                    text="[$name]: $cpu vCPU, $ram GB RAM, $osSizeGB GB SSD$cache"

                    #Create JSON
                    jq -n \
--- a/samples/SampleAppMain.bicep
+++ b/samples/SampleAppMain.bicep
@ -50,7 +50,7 @@ var environmentConfigurationMap = {
      networkPolicy: 'azure'
      agentCount:6
      agentCountMax:12
-      agentVMSize: 'Standard_D8s_v4'
+      agentVMSize: 'Standard_D8ds_v4'
    }
  }
  NonProduction: {
@ -62,7 +62,7 @@ var environmentConfigurationMap = {
      agentCount:1
      agentCountMax:3
      networkPolicy: ''
-      agentVMSize: 'Standard_DS3_v2'
+      agentVMSize: 'Standard_D4ds_v4'
    }
  }
 }
--- a/samples/SampleAppMain.json
+++ b/samples/SampleAppMain.json
--- a/samples/SystemPresetExample.bicep
+++ b/samples/SystemPresetExample.bicep
@ -15,7 +15,7 @@ param env string = 'dev'

 var envSystemPoolPresetMap = {
  'dev' : {
-    vmSize: 'Standard_B4ms'
+    vmSize: 'Standard_B4s_v2'
    count: 1
    minCount: 1
    maxCount: 3
@ -23,7 +23,7 @@ var envSystemPoolPresetMap = {
    availabilityZones: []
  }
  'test' : {
-    vmSize: 'Standard_B4ms'
+    vmSize: 'Standard_B4s_v2'
    count: 2
    minCount: 2
    maxCount: 6
--- a/samples/SystemPresetExample.json
+++ b/samples/SystemPresetExample.json
--- a/samples/peered-vnet/main.bicep
+++ b/samples/peered-vnet/main.bicep
@ -103,7 +103,7 @@ module gridAks '../../bicep/main.bicep' = {
  params: {
    location : location
    resourceName: gridResourceName
-    agentVMSize: 'Standard_B2ms'
+    agentVMSize: 'Standard_B2s_v2'
    osDiskType: 'Managed'
    enable_aad: true
    enableAzureRBAC : true
@ -128,7 +128,7 @@ module appAks '../../bicep/main.bicep' = {
  params: {
    location : location
    resourceName: 'app-${resourceName}'
-    agentVMSize: 'Standard_B2ms'
+    agentVMSize: 'Standard_B2s_v2'
    osDiskType: 'Managed'
    enable_aad: true
    enableAzureRBAC : true
@ -162,7 +162,7 @@ module aksNodePools '../../bicep/aksagentpool.bicep'  = [for pool in extraAksNod
    subnetId: gridVnet.outputs.aksSubnetId
    agentCount: 0
    agentCountMax: 10
-    agentVMSize: 'Standard_B2s'
+    agentVMSize: 'Standard_B2s_v2'
    maxPods: 10
    osDiskType: 'Managed'
    osType: 'Linux'
--- a/samples/shared-acr/main.json
+++ b/samples/shared-acr/main.json
--- a/samples/windows/main.bicep
+++ b/samples/windows/main.bicep
@ -27,7 +27,7 @@ module aks '../../bicep/main.bicep' = {
  params: {
    location : location
    resourceName: 'win-aks'
-    agentVMSize: 'Standard_B2ms'
+    agentVMSize: 'Standard_B2s_v2'
    osDiskType: 'Managed'
    enable_aad: true
    enableAzureRBAC : true