Skip to content

topic (iac): [secure-hybrid-network] update OS and VM SKU to modern Gen2 #268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ckittel merged 3 commits into from
May 28, 2026
Merged

topic (iac): [secure-hybrid-network] update OS and VM SKU to modern Gen2 #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
70d7dd1
update VM SKU and OS to modern Gen2 configuration
ferantivero May 13, 2026
a4d19e2
Address PR Feedback: update vmSize default in README
ferantivero May 28, 2026
82d0fb1
Address PR Feedback: retain patchSettings on mock-onprem VM
ferantivero May 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions solutions/secure-hybrid-network/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ az deployment group create -n firewallDnat -g rg-site-to-site-azure-network-east
|---|---|---|--|
| adminUserName | string | The admin user name for the virtual machines. | azureadmin |
| adminPassword | securestring | The admin password for the virtual machines. | null |
| vmSize | string | Size of the load-balanced virtual machines. | Standard_A4_v2 |
| vmSize | string | Size of the load-balanced virtual machines. | Standard_D2s_v3 |
| configureSitetosite | bool | Condition for configuring a site-to-site VPN connection. | true |
| hubNetwork | object | Object representing the configuration of the hub network. | name, addressPrefix |
| spokeNetwork | object | Object representing the configuration of the spoke network. | name, addressPrefix, subnetName, subnetPrefix, subnetNsgName |
Expand Down Expand Up @@ -101,7 +101,7 @@ az deployment group create -n firewallDnat -g rg-site-to-site-azure-network-east
| mocOnpremNetwork | object | Object representing the configuration of the mock on-prem network. | name, addressPrefix, mgmt, subnetPrefix |
| mocOnpremGateway | object | Object representing the configuration of the VPN gateway. | name, subnetName, subnetPrefix, publicIPAddressName |
| bastionHost | object | Object representing the configuration of the Bastion host. | name, subnetName, subnetPrefix, publicIPAddressName, nsgName |
| vmSize | string | Size of the virtual machine. | Standard_A4_v2 |
| vmSize | string | Size of the virtual machine. | Standard_D2s_v3 |
| configureSitetosite | bool | Condition for configuring a site-to-site VPN connection. | true |
| location | string | Location to be used for all resources. | rg location |

Expand Down
4 changes: 2 additions & 2 deletions solutions/secure-hybrid-network/nestedtemplates/azure-network-azuredeploy.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ param adminPassword string

@description('The count of Windows virtual machines to create.')
param webServerInstanceCount int = 2
param vmSize string = 'Standard_A4_v2'
param vmSize string = 'Standard_D2s_v3'

@ckittel ckittel May 28, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you need to update the listed default in the README now?

@ferantivero ferantivero May 28, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you are so right @ckittel,

done | addressed from a4d19e2

param configureSitetosite bool = true
param hubNetwork object = {
name: 'vnet-hub'
Expand Down Expand Up @@ -55,7 +55,7 @@ param location string = resourceGroup().location

var logAnalyticsWorkspaceName = 'la-${uniqueString(subscription().subscriptionId, resourceGroup().id)}'
var vmssName = 'vmss-web-server'
var windowsOSVersion = '2016-Datacenter'
var windowsOSVersion = '2025-datacenter-core-smalldisk-g2'

resource logAnalyticsWorkspace 'Microsoft.OperationalInsights/workspaces@2025-02-01' = {
name: logAnalyticsWorkspaceName
Expand Down
4 changes: 2 additions & 2 deletions solutions/secure-hybrid-network/nestedtemplates/azure-network-azuredeploy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
"vmSize": {
"type": "string",
"defaultValue": "Standard_A4_v2"
"defaultValue": "Standard_D2s_v3"
},
"configureSitetosite": {
"type": "bool",
Expand Down Expand Up @@ -101,7 +101,7 @@
"vmssName": "vmss-web-server",
"peering-name-hub-to-spoke": "hub-to-spoke",
"peering-name-spoke-to-hub": "spoke-to-hub",
"windowsOSVersion": "2022-datacenter-g2"
"windowsOSVersion": "2025-datacenter-core-smalldisk-g2"
},
Comment thread
ferantivero marked this conversation as resolved.
"resources": [
{
Expand Down
5 changes: 2 additions & 3 deletions solutions/secure-hybrid-network/nestedtemplates/mock-onprem-azuredeploy.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ param bastionHost object = {
publicIPAddressName: 'pip-bastion'
nsgName: 'nsg-hub-bastion'
}
param vmSize string = 'Standard_A4_v2'
param vmSize string = 'Standard_D2s_v3'
param configureSitetosite bool = true
param location string = resourceGroup().location

var nicNameWindowsName = 'nic-windows'
var vmNameWindowsName = 'vm-windows'
var windowsOSVersion = '2016-Datacenter'
var windowsOSVersion = '2025-datacenter-smalldisk-g2'

Comment thread
ferantivero marked this conversation as resolved.
resource mocOnpremNetworkResource 'Microsoft.Network/virtualNetworks@2024-05-01' = {
name: mocOnpremNetwork.name
Expand Down Expand Up @@ -284,7 +284,6 @@ resource windowsVM 'Microsoft.Compute/virtualMachines@2024-11-01' = {
windowsConfiguration: {
enableAutomaticUpdates: true
Comment thread
ferantivero marked this conversation as resolved.
patchSettings: {
//Machines should be configured to periodically check for missing system updates
assessmentMode: 'AutomaticByPlatform'
patchMode: 'AutomaticByPlatform'
}
Expand Down
13 changes: 10 additions & 3 deletions solutions/secure-hybrid-network/nestedtemplates/mock-onprem-azuredeploy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
},
"vmSize": {
"type": "string",
"defaultValue": "Standard_DS1_v2"
"defaultValue": "Standard_D2s_v3"
},
Comment on lines 39 to 42
"configureSitetosite": {
"type": "bool",
Expand All @@ -51,7 +51,7 @@
"variables": {
"nicNameWindows": "nic-windows",
"vmNameWindows": "vm-windows",
"windowsOSVersion": "2016-Datacenter"
"windowsOSVersion": "2025-datacenter-smalldisk-g2"
},
Comment thread
ferantivero marked this conversation as resolved.
"resources": [
{
Expand Down Expand Up @@ -327,7 +327,14 @@
"osProfile": {
"computerName": "[variables('vmNameWindows')]",
"adminUsername": "[parameters('adminUsername')]",
"adminPassword": "[parameters('adminPassword')]"
"adminPassword": "[parameters('adminPassword')]",
"windowsConfiguration": {
"enableAutomaticUpdates": true,
"patchSettings": {
"assessmentMode": "AutomaticByPlatform",
"patchMode": "AutomaticByPlatform"
}
}
},
"storageProfile": {
"imageReference": {
Expand Down
Loading