add parameter for jumpbox VM size as well as AKS VMs

Author: Carlos Mestre del Pino

Scenarios/AKS-Secure-Baseline-PrivateCluster/Bicep/04-Network-LZ/main.bicep

@@ -23,6 +23,7 @@ param spokeSubnetAppGWPrefix string = '10.1.2.0/27'
 param spokeSubnetVMPrefix string = '10.1.3.0/24'
 param spokeSubnetPLinkervicePrefix string = '10.1.4.0/24'
 param remotePeeringName string = 'spoke-hub-peering'
+param vmSize string = 'Standard_DS2_v2'
 
 var privateDNSZoneAKSSuffixes = {
   AzureCloud: '.azmk8s.io'
@@ -350,7 +351,7 @@ module virtualMachine 'br/public:avm/res/compute/virtual-machine:0.5.0' = {
       }
     }
     osType: 'Linux'
-    vmSize: 'Standard_DS2_v2'
+    vmSize: vmSize
     zone: 0
     // Non-required parameters
     disablePasswordAuthentication: false

Scenarios/AKS-Secure-Baseline-PrivateCluster/Bicep/All-in-One-Bicep/main.bicep

@@ -251,6 +251,7 @@ param azureBastionSubnetName string = 'AzureBastionSubnet'
 param azureBastionSubnetAddressPrefix string = '10.0.2.0/27'
 param vmsubnetSubnetName string = 'vmsubnet'
 param vmsubnetSubnetAddressPrefix string = '10.0.3.0/24'
+param linuxVirtualMachineVMSize string = 'Standard_DS2_v2'
 
 /////////////////
 // 05-AKS-Supporting
@@ -299,7 +300,7 @@ param aksadminaccessprincipalId string
 param kubernetesVersion string = '1.30'
 param networkPlugin string = 'azure'
 param aksClusterName string = 'aksCluster'
-param vmSize string = 'Standard_D4d_v5'
+param aksVMSize string = 'Standard_D4d_v5'
 
 //////////////////////////////////
 //////////////////////////////////
@@ -367,6 +368,7 @@ module networkSpoke '../04-Network-LZ/main.bicep' = {
     spokeSubnetVMPrefix:spokeSubnetVMPrefix
     spokeSubnetPLinkervicePrefix: spokeSubnetPLinkervicePrefix
     remotePeeringName: remotePeeringName
+    vmSize: linuxVirtualMachineVMSize
 
   }
   dependsOn: deployHub ? [networkHub] : []
@@ -412,6 +414,6 @@ module aksCluster '../06-AKS-Cluster/main.bicep' = {
     networkPlugin: networkPlugin
     acrName: aksSupporting.outputs.acrName
     aksClusterName: aksClusterName
-    vmSize: vmSize
+    vmSize: aksVMSize
   }
 }

Scenarios/AKS-Secure-Baseline-PrivateCluster/Bicep/All-in-One-Bicep/main.json

@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.30.23.60470",
-      "templateHash": "3419662636992204656"
+      "templateHash": "2060098085920409973"
     }
   },
   "parameters": {
@@ -365,6 +365,10 @@
       "type": "string",
       "defaultValue": "10.0.3.0/24"
     },
+    "linuxVirtualMachineVMSize": {
+      "type": "string",
+      "defaultValue": "Standard_DS2_v2"
+    },
     "subnetName": {
       "type": "string",
       "defaultValue": "servicespe"
@@ -438,7 +442,7 @@
       "type": "string",
       "defaultValue": "aksCluster"
     },
-    "vmSize": {
+    "aksVMSize": {
       "type": "string",
       "defaultValue": "Standard_D4d_v5"
     }
@@ -7749,6 +7753,9 @@
           },
           "remotePeeringName": {
             "value": "[parameters('remotePeeringName')]"
+          },
+          "vmSize": {
+            "value": "[parameters('linuxVirtualMachineVMSize')]"
           }
         },
         "template": {
@@ -7758,7 +7765,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.30.23.60470",
-              "templateHash": "9558533891196009747"
+              "templateHash": "7704816282859867531"
             }
           },
           "parameters": {
@@ -7836,6 +7843,10 @@
             "remotePeeringName": {
               "type": "string",
               "defaultValue": "spoke-hub-peering"
+            },
+            "vmSize": {
+              "type": "string",
+              "defaultValue": "Standard_DS2_v2"
             }
           },
           "variables": {
@@ -22653,7 +22664,7 @@
                     "value": "Linux"
                   },
                   "vmSize": {
-                    "value": "Standard_DS2_v2"
+                    "value": "[parameters('vmSize')]"
                   },
                   "zone": {
                     "value": 0
@@ -37936,7 +37947,7 @@
             "value": "[parameters('aksClusterName')]"
           },
           "vmSize": {
-            "value": "[parameters('vmSize')]"
+            "value": "[parameters('aksVMSize')]"
           }
         },
         "template": {

Scenarios/AKS-Secure-Baseline-PrivateCluster/Bicep/All-in-One-Bicep/main.portal.ui.json

@@ -606,7 +606,7 @@
               "visible": true
             },
             {
-              "name": "vmSize",
+              "name": "aksVMSize",
               "type": "Microsoft.Common.TextBox",
               "label": "AKS VM Size",
               "subLabel": "",
@@ -621,6 +621,22 @@
               "infoMessages": [],
               "visible": true
             },
+            {
+              "name": "linuxVirtualMachineVMSize",
+              "type": "Microsoft.Common.TextBox",
+              "label": "Linux Jumpbox VM Size",
+              "subLabel": "",
+              "defaultValue": "Standard_DS2_v2",
+              "toolTip": "VM size availability varies by region",
+              "constraints": {
+                "required": true,
+                "regex": "",
+                "validationMessage": "",
+                "validations": []
+              },
+              "infoMessages": [],
+              "visible": true
+            },
             {
               "name": "aksSubnetName",
               "type": "Microsoft.Common.TextBox",