Skip to content

Fix: Enable Flexible Availability Zone Configuration for Reliable Re-deployments #847

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

Draft
Copilot wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Fix: Enable Flexible Availability Zone Configuration for Reliable Re-deployments #847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6308d6d
Initial plan
Copilot Oct 16, 2025
c3adfe0
Fix availability zone re-deployment issues
Copilot Oct 16, 2025
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
7 changes: 1 addition & 6 deletions workload/bicep/brownfield/newSessionHosts/deploy.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,7 @@ param enableAcceleratedNetworking bool = true
])
param availability string = 'None'

@sys.description('The Availability Zones to use for the session hosts.')
@allowed([
'1'
'2'
'3'
])
@sys.description('The Availability Zones to use for the session hosts. Valid values are combinations of \'1\', \'2\', \'3\', or an empty array for regions without availability zones.')
param availabilityZones array = ['1', '2', '3']

@sys.description('Set to deploy image from Azure Compute Gallery. (Default: false)')
Expand Down
7 changes: 1 addition & 6 deletions workload/bicep/deploy-baseline.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,12 +236,7 @@ param avdSessionHostCountIndex int = 1
])
param availability string = 'None'

@sys.description('The Availability Zones to use for the session hosts.')
@allowed([
'1'
'2'
'3'
])
@sys.description('The Availability Zones to use for the session hosts. Valid values are combinations of \'1\', \'2\', \'3\', or an empty array for regions without availability zones.')
param availabilityZones array = ['1', '2', '3']

@sys.description('When true, Zone Redundant Storage (ZRS) is used, when set to false, Locally Redundant Storage (LRS) is used. (Default: false)')
Expand Down
3 changes: 2 additions & 1 deletion workload/bicep/modules/avdSessionHosts/deploy.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ var varCustomOsDiskProperties = {
diskSizeGB: customOsDiskSizeGB != 0 ? customOsDiskSizeGB : null
}
var varZones = [for zone in availabilityZones: int(zone)]
var varHasZones = length(availabilityZones) > 0

// =========== //
// Deployments //
Expand All @@ -188,7 +189,7 @@ module sessionHosts '../../../../avm/1.0.0/res/compute/virtual-machine/main.bice
name: '${namePrefix}${padLeft((i + countIndex), 4, '0')}'
location: location
timeZone: timeZone
zone: availability == 'AvailabilityZones' ? varZones[i % length(varZones)] : 0
zone: availability == 'AvailabilityZones' && varHasZones ? varZones[i % length(varZones)] : 0
managedIdentities: contains(identityServiceProvider, 'EntraID') || deployMonitoring
? {
systemAssigned: true
Expand Down
6 changes: 1 addition & 5 deletions workload/portal-ui/brownfield/portalUiNewSessionHosts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,11 +557,7 @@
"name": "availabilityZones",
"type": "Microsoft.Common.DropDown",
"label": "Select Availability Zones",
"defaultValue": [
"Zone 1",
"Zone 2",
"Zone 3"
],
"defaultValue": "[map(first(map(first(map(filter(steps('sessionHosts').resourceSkusApi.value, (sku) => contains(sku.name, steps('sessionHosts').settings.vmSize)), (sku) => sku.locationInfo)), (sku) => sku.zones)), (zone) => parse(concat('{\"label\":\"Zone ', zone, '\",\"value\":\"', zone, '\"}')))]",
"multiselect": true,
"selectAll": true,
"toolTip": "Select the desired Availability Zones",
Expand Down
6 changes: 1 addition & 5 deletions workload/portal-ui/portal-ui-baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1025,11 +1025,7 @@
"name": "availabilityZones",
"type": "Microsoft.Common.DropDown",
"label": "Select Availability Zones",
"defaultValue": [
"Zone 1",
"Zone 2",
"Zone 3"
],
"defaultValue": "[map(first(map(first(map(filter(steps('sessionHosts').sessionHostsRegionSection.resourceSkusApi.value, (sku) => contains(sku.name, steps('sessionHosts').sessionHostsSettingsSection.sessionHostSize)), (sku) => sku.locationInfo)), (sku) => sku.zones)), (zone) => parse(concat('{\"label\":\"Zone ', zone, '\",\"value\":\"', zone, '\"}')))]",
"multiselect": true,
"selectAll": true,
"toolTip": "Select the desired Availability Zones",
Expand Down