Skip to content
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

Multiregion bugfix #1692

Merged
merged 20 commits into from
Jul 1, 2024
Merged

Multiregion bugfix #1692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
1c11662
Fixed logic on secondary region hubs
brsteph Jun 26, 2024
3d3773e
Updated VWAN
brsteph Jun 26, 2024
e7dd0a8
Updated API for VPN gateway
brsteph Jun 27, 2024
567d2c2
Updated logic for peering secondary vnet identity
brsteph Jun 27, 2024
769f869
Updated the conditions for secondary zone linking
brsteph Jun 28, 2024
c1f03ad
Added "identity address prefix secondary" not empty on second DNS
brsteph Jun 28, 2024
8cb2ff1
Defined azFireswallResourceIdSecondary
brsteph Jun 28, 2024
9a41f88
Added logic to assign zones to IPs if the GW is Zonal for hub and spoke.
brsteph Jun 28, 2024
5e158d7
Fixed double quote issue
brsteph Jun 28, 2024
b0eaa9e
Fixing zone logic for public IPs to handle the strings
brsteph Jun 28, 2024
7f13395
Adjusting conditional
brsteph Jun 28, 2024
0fce6ef
Zone logic
brsteph Jun 28, 2024
f557fab
Adjusting conditions for peering to prevent a false attempt on single…
brsteph Jun 28, 2024
0e2e06f
variablizing zones for GW, id peering logic
brsteph Jun 28, 2024
c494422
Going for split for Zones as a test
brsteph Jun 28, 2024
7dec46e
Fixing identity address
brsteph Jun 28, 2024
fd6909e
Array split
brsteph Jun 28, 2024
680c7ce
Updating ES Lite Peering of hubs
brsteph Jun 28, 2024
d9f5ab1
Fix Firewall ID
brsteph Jun 28, 2024
790c9c0
Merge branch 'main' into multiregion-bugfix
brsteph Jun 28, 2024
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
22 changes: 12 additions & 10 deletions eslzArm/eslzArm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1892,6 +1892,7 @@
"ddosName": "[concat(parameters('enterpriseScaleCompanyPrefix'), '-ddos-', parameters('connectivityLocation'))]",
"azFwPolicyName": "[concat(parameters('enterpriseScaleCompanyPrefix'), '-azfwpolicy-', parameters('connectivityLocation'))]",
"azFwName": "[concat(parameters('enterpriseScaleCompanyPrefix'), '-fw-', parameters('connectivityLocation'))]",
"azFwNameSecondary": "[concat(parameters('enterpriseScaleCompanyPrefix'), '-fw-', parameters('connectivityLocationSecondary'))]",
"azErGwIpName": "[concat(parameters('enterpriseScaleCompanyPrefix'), '-erpip-', parameters('connectivityLocation'))]",
"hubName": "[concat(parameters('enterpriseScaleCompanyPrefix'), '-hub-', parameters('connectivityLocation'))]",
"hubNameSecondary": "[concat(parameters('enterpriseScaleCompanyPrefix'), '-hub-', parameters('connectivityLocationSecondary'))]",
Expand All @@ -1918,6 +1919,7 @@
"vWanHubResourceIdSecondary": "[concat('/subscriptions/', variables('singleVsDedicatedConnectivitySub'), '/resourceGroups/', variables('platformRgNames').connectivityRg, '/providers/Microsoft.Network/virtualHubs/', variables('platformResourceNames').hubNameSecondary)]",
"privateDnsRgResourceId": "[concat('/subscriptions/', variables('singleVsDedicatedConnectivitySub'), '/resourceGroups/', variables('platformRgNames').privateDnsRg)]",
"azFirewallResourceId": "[concat('/subscriptions/', variables('singleVsDedicatedConnectivitySub'), '/resourceGroups/', variables('platformRgNames').connectivityRg, '/providers/Microsoft.Network/azureFirewalls/', variables('platformResourceNames').azFwName)]",
"azFirewallResourceIdSecondary": "[concat('/subscriptions/', variables('singleVsDedicatedConnectivitySub'), '/resourceGroups/', variables('platformRgNames').connectivityRgSecondary, '/providers/Microsoft.Network/azureFirewalls/', variables('platformResourceNames').azFwNameSecondary)]",
"userAssignedIdentityResourceId": "[concat('/subscriptions/', variables('singleVsDedicatedMgmtSub'), '/resourceGroups/', variables('platformRgNames').mgmtRg, '/providers/Microsoft.ManagedIdentity/userAssignedIdentities/', variables('platformResourceNames').userAssignedIdentity)]"
},
// Declaring deterministic resourceId's for ES Lite platform resources (as they will be consolidated into a single platform subscription)
Expand Down Expand Up @@ -4700,7 +4702,7 @@
},
{
// Creating the virtual network hub (hub and spoke)
"condition": "[and(not(empty(parameters('connectivitySubscriptionId'))),equals(parameters('enableHub'), 'vhub'))]",
"condition": "[and(not(empty(parameters('connectivitySubscriptionId'))), equals(parameters('enableHub'), 'vhub'))]",
"type": "Microsoft.Resources/deployments",
"apiVersion": "2020-10-01",
"scope": "[variables('scopes').connectivityManagementGroup]",
Expand Down Expand Up @@ -4951,7 +4953,7 @@
"value": "[parameters('vWANHubCapacity')]"
},
"enableHubSecondary": {
"value": "[parameters('enableHubSecondary')]"
"value": "[parameters('enableSecondaryRegion')]"
},
"enableAzFwSecondary": {
"value": "[parameters('enableAzFwSecondary')]"
Expand Down Expand Up @@ -5078,7 +5080,7 @@
"value": "[parameters('enablePrivateDnsZonesSecondary')]"
},
"enableHubSecondary": {
"value": "[parameters('enableHubSecondary')]"
"value": "[parameters('enableSecondaryRegion')]"
}
}
}
Expand Down Expand Up @@ -5168,7 +5170,7 @@
*/
{
// Creating the virtual network hub (hub and spoke) in a secondary region
"condition": "[and(not(empty(parameters('connectivitySubscriptionId'))),equals(parameters('enableHubSecondary'), 'vhub'))]",
"condition": "[and(not(empty(parameters('connectivitySubscriptionId'))), equals(parameters('enableSecondaryRegion'), 'Yes'), equals(parameters('enableHubSecondary'), 'vhub'))]",
"type": "Microsoft.Resources/deployments",
"apiVersion": "2020-10-01",
"scope": "[variables('scopes').connectivityManagementGroup]",
Expand Down Expand Up @@ -5264,7 +5266,7 @@
},
{
// Creating the virtual network hub (with NVA) in a secondary region
"condition": "[and(not(empty(parameters('connectivitySubscriptionId'))),equals(parameters('enableHubSecondary'), 'nva'))]",
"condition": "[and(not(empty(parameters('connectivitySubscriptionId'))),equals(parameters('enableSecondaryRegion'), 'Yes'), equals(parameters('enableHubSecondary'), 'nva'))]",
"type": "Microsoft.Resources/deployments",
"apiVersion": "2020-10-01",
"scope": "[variables('scopes').connectivityManagementGroup]",
Expand Down Expand Up @@ -5342,7 +5344,7 @@
},
{
// Peering the primary hub and the secondary hub (when nva or vhub is selected)
"condition": "[and(not(empty(parameters('connectivitySubscriptionId'))), or(equals(parameters('enableHub'), 'nva'), equals(parameters('enableHub'), 'vhub')), or(equals(parameters('enableHubSecondary'), 'nva'), equals(parameters('enableHubSecondary'), 'vhub')))]",
"condition": "[and(not(empty(parameters('connectivitySubscriptionId'))), or(equals(parameters('enableHub'), 'nva'), equals(parameters('enableHub'), 'vhub')), or(equals(parameters('enableHubSecondary'), 'nva'), equals(parameters('enableHubSecondary'), 'vhub')), equals(parameters('enableSecondaryRegion'), 'Yes'))]",
"type": "Microsoft.Resources/deployments",
"apiVersion": "2020-06-01",
"name": "[variables('deploymentNames').hubPeeringDeploymentName]",
Expand Down Expand Up @@ -7087,7 +7089,7 @@
},
{
// Peer vnet in identity subscription to connectivity hub in a secondary region if vhub or nva condition is true
"condition": "[and(or(equals(parameters('enableHubSecondary'), 'nva'), equals(parameters('enableHubSecondary'), 'vhub')), not(empty(parameters('identityAddressPrefix'))))]",
"condition": "[and(or(equals(parameters('enableHubSecondary'), 'nva'), equals(parameters('enableHub'), 'vhub')), not(empty(parameters('identityAddressPrefixSecondary'))))]",
"type": "Microsoft.Resources/deployments",
"apiVersion": "2020-06-01",
"name": "[variables('deploymentNames').identityPeering2DeploymentName]",
Expand Down Expand Up @@ -8240,7 +8242,7 @@
*/
{
// Configuring and deploying the connectivity hub (hub and spoke) in a secondary region
"condition": "[and(not(empty(parameters('singlePlatformSubscriptionId'))),equals(parameters('enableHubSecondary'), 'vhub'))]",
"condition": "[and(not(empty(parameters('singlePlatformSubscriptionId'))), equals(parameters('enableSecondaryRegion'), 'Yes'), equals(parameters('enableHubSecondary'), 'vhub'))]",
"type": "Microsoft.Resources/deployments",
"apiVersion": "2019-05-01",
"scope": "[variables('scopes').platformManagementGroup]",
Expand Down Expand Up @@ -8337,7 +8339,7 @@
*/
{
// Configuring and deploying the connectivity hub (NVA) in a secondary region
"condition": "[and(not(empty(parameters('singlePlatformSubscriptionId'))),equals(parameters('enableHubSecondary'), 'nva'))]",
"condition": "[and(not(empty(parameters('singlePlatformSubscriptionId'))), equals(parameters('enableSecondaryRegion'), 'Yes'), equals(parameters('enableHubSecondary'), 'nva'))]",
"type": "Microsoft.Resources/deployments",
"apiVersion": "2019-05-01",
"scope": "[variables('scopes').platformManagementGroup]",
Expand Down Expand Up @@ -8416,7 +8418,7 @@
*/
{
// Peering the primary hub and the secondary hub (when nva or vhub is selected)
"condition": "[and(not(empty(parameters('singlePlatformSubscriptionId'))), or(equals(parameters('enableHub'), 'nva'), equals(parameters('enableHub'), 'vhub')), or(equals(parameters('enableHubSecondary'), 'nva'), equals(parameters('enableHubSecondary'), 'vhub')))]",
"condition": "[and(not(empty(parameters('singlePlatformSubscriptionId'))), or(equals(parameters('enableHub'), 'nva'), equals(parameters('enableHub'), 'vhub')), or(equals(parameters('enableHubSecondary'), 'nva'), equals(parameters('enableHubSecondary'), 'vhub')), equals(parameters('enableSecondaryRegion'), 'Yes'))]",
"type": "Microsoft.Resources/deployments",
"apiVersion": "2020-06-01",
"name": "[variables('esLitedeploymentNames').hubPeeringDeploymentName]",
Expand Down
9 changes: 6 additions & 3 deletions eslzArm/subscriptionTemplates/hubspoke-connectivity.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@
"azErGwIpName": "[concat(variables('erGwName'), '-pip')]",
"azVpnGwPipId": "[concat('/subscriptions/', parameters('connectivitySubscriptionId'), '/resourceGroups/', variables('rgName'), '/providers/Microsoft.Network/publicIPAddresses/', variables('azVpnGwIpName'))]",
"azVpnGwAAPipId": "[concat('/subscriptions/', parameters('connectivitySubscriptionId'), '/resourceGroups/', variables('rgName'), '/providers/Microsoft.Network/publicIPAddresses/', variables('azVpnGwAAIpName'))]",
"azVpnPIPZones": "[split('1,2,3', ',')]",
"azFwIpName": "[concat(variables('azFwName'), '-pip')]",
"azFwMgmtIpName": "[concat(variables('azFwName'), '-mgmtpip')]",
"azErGwSubnetId": "[concat('/subscriptions/', parameters('connectivitySubscriptionId'), '/resourceGroups/', variables('rgName'),'/providers/Microsoft.Network/virtualNetworks/', variables('hubname'), '/subnets/GatewaySubnet')]",
Expand Down Expand Up @@ -298,10 +299,11 @@
},
{
"condition": "[and(equals(parameters('enableVpnGw'), 'Yes'), not(empty(parameters('subnetMaskForGw'))))]",
"apiVersion": "2020-05-01",
"apiVersion": "2023-11-01",
"type": "Microsoft.Network/publicIpAddresses",
"location": "[parameters('location')]",
"name": "[variables('azVpnGwIpName')]",
"zones": "[if(equals(parameters('gwRegionalOrAz'), 'Zone'), variables('azVpnPIPZones'), json('null'))]",
"sku": {
"name": "Standard"
},
Expand All @@ -311,10 +313,11 @@
},
{
"condition": "[and(equals(parameters('enableVpnGw'), 'Yes'), equals(parameters('enableVpnActiveActive'),'Yes'), not(empty(parameters('subnetMaskForGw'))))]",
"apiVersion": "2020-05-01",
"apiVersion": "2023-11-01",
"type": "Microsoft.Network/publicIpAddresses",
"location": "[parameters('location')]",
"name": "[variables('azVpnGwAAIpName')]",
"zones": "[if(equals(parameters('gwRegionalOrAz'), 'Zone'), variables('azVpnPIPZones'), json('null'))]",
"sku": {
"name": "Standard"
},
Expand All @@ -324,7 +327,7 @@
},
{
"condition": "[and(equals(parameters('enableVpnGw'), 'Yes'), equals(parameters('enableVpnActiveActive'),'No'), not(empty(parameters('subnetMaskForGw'))))]",
"apiVersion": "2020-05-01",
"apiVersion": "2023-11-01",
"name": "[variables('vpngwname')]",
"type": "Microsoft.Network/virtualNetworkGateways",
"location": "[parameters('location')]",
Expand Down
8 changes: 4 additions & 4 deletions eslzArm/subscriptionTemplates/vwan-connectivity.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
"enableHubSecondary": {
"type": "string",
"allowedValues": [
"vwan",
"Yes",
"No"
],
"defaultValue": "No"
Expand Down Expand Up @@ -477,7 +477,7 @@
},
//Begin Secondary vhub Deployment
{
"condition": "[and(equals(parameters('enableHubSecondary'), 'vwan'), not(empty(parameters('addressPrefixSecondary'))))]",
"condition": "[and(equals(parameters('enableHubSecondary'), 'Yes'), not(empty(parameters('addressPrefixSecondary'))))]",
"type": "Microsoft.Network/virtualHubs",
"apiVersion": "2023-04-01",
"location": "[parameters('locationSecondary')]",
Expand All @@ -498,7 +498,7 @@
}
},
{
"condition": "[and(equals(parameters('enableHubSecondary'), 'vwan'), equals(parameters('enableVpnGwSecondary'), 'Yes'))]",
"condition": "[and(equals(parameters('enableHubSecondary'), 'Yes'), equals(parameters('enableVpnGwSecondary'), 'Yes'))]",
"type": "Microsoft.Network/vpnGateways",
"apiVersion": "2020-05-01",
"location": "[parameters('locationSecondary')]",
Expand All @@ -517,7 +517,7 @@
}
},
{
"condition": "[and(equals(parameters('enableHubSecondary'), 'vwan'), equals(parameters('enableErGwSecondary'), 'Yes'))]",
"condition": "[and(equals(parameters('enableHubSecondary'), 'Yes'), equals(parameters('enableErGwSecondary'), 'Yes'))]",
"type": "Microsoft.Network/expressRouteGateways",
"apiVersion": "2020-05-01",
"location": "[parameters('locationSecondary')]",
Expand Down
Loading