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

Add support to deploy an additional VWAN hub to an existing Virtual WAN #456

Merged
merged 27 commits into from
Feb 28, 2023
Merged

Add support to deploy an additional VWAN hub to an existing Virtual WAN #456

Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
9d51774
create mulitple vWAN hubs
aarunraaj Feb 22, 2023
f753329
Merge branch 'Azure:main' into main
aarunraaj Feb 22, 2023
64f27d6
removed modification comments from the code
aarunraaj Feb 22, 2023
ac6854c
Merge branch 'main' of https://github.com/aarunraaj/ALZ-Bicep
aarunraaj Feb 22, 2023
1b98acf
removed commented lines
aarunraaj Feb 22, 2023
fc36e8e
updated baseline sample file to include the new changes
aarunraaj Feb 22, 2023
b36c61f
updated main module, baseline and parameters
aarunraaj Feb 22, 2023
d57d4ba
updated parameters.min file
aarunraaj Feb 22, 2023
74afa8f
removed comments from parameters file
aarunraaj Feb 22, 2023
4d7d688
camelCasing updates
aarunraaj Feb 22, 2023
872b24e
Update vwanConnectivity.parameters.min.json
aarunraaj Feb 22, 2023
e13038d
parameters file updates
aarunraaj Feb 22, 2023
a444d6a
Merge branch 'main' into main
jtracey93 Feb 23, 2023
5df47c7
UpdatevWAN Hub parameters decorator to include more details
aarunraaj Feb 23, 2023
98fa97f
Merge branch 'main' of https://github.com/aarunraaj/ALZ-Bicep
aarunraaj Feb 23, 2023
04aa12c
updated mc-vwanConnectivity parameters min and all.json
aarunraaj Feb 23, 2023
68ca36a
Update vwanConnectivity.bicep
aarunraaj Feb 23, 2023
a103557
Merge branch 'Azure:main' into main
aarunraaj Feb 23, 2023
be78e2a
Merge branch 'Azure:main' into main
aarunraaj Feb 28, 2023
21d1d1f
Update vwanConnectivity.bicep
aarunraaj Feb 28, 2023
b824e78
Apply suggestions from code review
jtracey93 Feb 28, 2023
a50f0ce
Apply suggestions from code review
jtracey93 Feb 28, 2023
47176c8
update the markdown file
aarunraaj Feb 28, 2023
ba0b95a
Update vwanConnectivity.bicep
jtracey93 Feb 28, 2023
1f5851a
Update vwanConnectivity.bicep.md
jtracey93 Feb 28, 2023
ac9e634
Update vwanConnectivity.bicep.md
jtracey93 Feb 28, 2023
d84a872
Update vwanConnectivity.bicep.md
jtracey93 Feb 28, 2023
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
35 changes: 18 additions & 17 deletions ...as-code/bicep/modules/vwanConnectivity/parameters/mc-vwanConnectivity.parameters.all.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,48 +8,49 @@
"parCompanyPrefix": {
"value": "alz"
},
"parVirtualHubAddressPrefix": {
"value": "10.100.0.0/23"
},
"parAzFirewallTier": {
"value": "Standard"
},
"parVirtualHubEnabled": {
"value": true
},
"parVpnGatewayEnabled": {
"value": true
},
"parExpressRouteGatewayEnabled": {
"value": true
},
"parAzFirewallEnabled": {
"value": true
},
"parAzFirewallDnsProxyEnabled": {
"value": true
},
"parVirtualWanName": {
"value": "alz-vwan-chinaeast2"
},
"parVirtualWanHubName": {
"value": "alz-vhub-chinaeast2"
"value": "alz-vhub"
},
"parVpnGatewayName": {
"value": "alz-vpngw-chinaeast2"
"value": "alz-vpngw"
},
"parExpressRouteGatewayName": {
"value": "alz-ergw-chinaeast2"
"value": "alz-ergw"
},
"parAzFirewallName": {
"value": "alz-fw-chinaeast2"
"value": "alz-fw"
},
"parAzFirewallAvailabilityZones": {
"value": []
},
"parAzFirewallPoliciesName": {
"value": "alz-azfwpolicy-chinaeast2"
},
"parVirtualWanHubs": {
"value": [
{
"parVpnGatewayEnabled": true,
"parExpressRouteGatewayEnabled": true,
"parAzFirewallEnabled": true,
"parVirtualHubAddressPrefix": "10.100.0.0/23",
"parHublocation": "chinaeast2",
"parHubRoutingPreference":"",
jtracey93 marked this conversation as resolved.
Show resolved Hide resolved
"parVirtualRouterAutoScaleConfiguration": 2
}
]
},
"parVpnGatewayScaleUnit": {
"value": 1
},
Expand Down Expand Up @@ -110,4 +111,4 @@
"value": false
}
}
}
}
25 changes: 13 additions & 12 deletions ...as-code/bicep/modules/vwanConnectivity/parameters/mc-vwanConnectivity.parameters.min.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,24 @@
"parCompanyPrefix": {
"value": "alz"
},
"parVirtualHubAddressPrefix": {
"value": "10.100.0.0/23"
},
"parAzFirewallTier": {
"value": "Standard"
},
"parVirtualHubEnabled": {
"value": true
},
"parVpnGatewayEnabled": {
"value": true
},
"parExpressRouteGatewayEnabled": {
"value": true
},
"parAzFirewallEnabled": {
"value": true
"parVirtualWanHubs": {
"value": [
{
"parVpnGatewayEnabled": true,
"parExpressRouteGatewayEnabled": true,
"parAzFirewallEnabled": true,
"parVirtualHubAddressPrefix": "10.100.0.0/23",
"parHublocation": "chinaeast2",
"parHubRoutingPreference": "",
jtracey93 marked this conversation as resolved.
Show resolved Hide resolved
"parVirtualRouterAutoScaleConfiguration": 2
}
]
},
"parAzFirewallDnsProxyEnabled": {
"value": true
Expand Down Expand Up @@ -84,4 +85,4 @@
"value": false
}
}
}
}
42 changes: 26 additions & 16 deletions infra-as-code/bicep/modules/vwanConnectivity/parameters/vwanConnectivity.parameters.all.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,48 +8,58 @@
"parCompanyPrefix": {
"value": "alz"
},
"parVirtualHubAddressPrefix": {
"value": "10.100.0.0/23"
},
"parAzFirewallTier": {
"value": "Standard"
},
"parVirtualHubEnabled": {
"value": true
},
"parVpnGatewayEnabled": {
"value": true
},
"parExpressRouteGatewayEnabled": {
"value": true
},
"parAzFirewallEnabled": {
"value": true
},
"parAzFirewallDnsProxyEnabled": {
"value": true
},
"parVirtualWanName": {
"value": "alz-vwan-eastus"
},
"parVirtualWanHubName": {
"value": "alz-vhub-eastus"
"value": "alz-vhub"
},
"parVpnGatewayName": {
"value": "alz-vpngw-eastus"
"value": "alz-vpngw"
},
"parExpressRouteGatewayName": {
"value": "alz-ergw-eastus"
"value": "alz-ergw"
},
"parAzFirewallName": {
"value": "alz-fw-eastus"
"value": "alz-fw"
},
"parAzFirewallAvailabilityZones": {
"value": []
},
"parAzFirewallPoliciesName": {
"value": "alz-azfwpolicy-eastus"
},
"parVirtualWanHubs": {
"value": [
{
"parVpnGatewayEnabled": true,
"parExpressRouteGatewayEnabled": true,
"parAzFirewallEnabled": true,
"parVirtualHubAddressPrefix": "10.100.0.0/23",
"parHublocation": "eastus",
"parHubRoutingPreference":"",
jtracey93 marked this conversation as resolved.
Show resolved Hide resolved
"parVirtualRouterAutoScaleConfiguration": 2
},
{
"parVpnGatewayEnabled": true,
"parExpressRouteGatewayEnabled": true,
"parAzFirewallEnabled": true,
"parVirtualHubAddressPrefix": "10.110.0.0/23",
"parHublocation": "westus",
"parHubRoutingPreference":"",
jtracey93 marked this conversation as resolved.
Show resolved Hide resolved
"parVirtualRouterAutoScaleConfiguration": 2
}
]
},
"parVpnGatewayScaleUnit": {
"value": 1
},
Expand Down
25 changes: 13 additions & 12 deletions infra-as-code/bicep/modules/vwanConnectivity/parameters/vwanConnectivity.parameters.min.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,24 @@
"parCompanyPrefix": {
"value": "alz"
},
"parVirtualHubAddressPrefix": {
"value": "10.100.0.0/23"
},
"parAzFirewallTier": {
"value": "Standard"
},
"parVirtualHubEnabled": {
"value": true
},
"parVpnGatewayEnabled": {
"value": true
},
"parExpressRouteGatewayEnabled": {
"value": true
},
"parAzFirewallEnabled": {
"value": true
"parVirtualWanHubs": {
"value": [
{
"parVpnGatewayEnabled": true,
"parExpressRouteGatewayEnabled": true,
"parAzFirewallEnabled": true,
"parVirtualHubAddressPrefix": "10.100.0.0/23",
"parHublocation": "eastus",
"parHubRoutingPreference": "",
jtracey93 marked this conversation as resolved.
Show resolved Hide resolved
"parVirtualRouterAutoScaleConfiguration": 2
}
]
},
"parAzFirewallDnsProxyEnabled": {
"value": true
Expand All @@ -48,4 +49,4 @@
"value": false
}
}
}
}
25 changes: 15 additions & 10 deletions infra-as-code/bicep/modules/vwanConnectivity/samples/baseline.sample.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,23 @@ module minimum_vwan_conn '../vwanConnectivity.bicep' = {
name: 'minimum_vwan_conn'
params: {
parLocation: parLocation
parVirtualHubAddressPrefix: '10.100.0.0/23'
parAzFirewallTier: 'Standard'
parVirtualHubEnabled: true
parVpnGatewayEnabled: true
parExpressRouteGatewayEnabled: true
parAzFirewallEnabled: true
parVirtualWanHubs:[{
parVpnGatewayEnabled: true
parExpressRouteGatewayEnabled: true
parAzFirewallEnabled: true
parVirtualHubAddressPrefix: '10.100.0.0/23'
parHublocation: 'centralus'
parhubRoutingPreference:'' //allowed values are 'ASN','VpnGateway','ExpressRoute'
jtracey93 marked this conversation as resolved.
Show resolved Hide resolved
parvirtualRouterAutoScaleConfiguration: 2 //minimum capacity should be between 2 to 50
}]
parAzFirewallDnsProxyEnabled: true
parVirtualWanName: '${parCompanyPrefix}-vwan-${parLocation}'
parVirtualWanHubName: '${parCompanyPrefix}-vhub-${parLocation}'
parVpnGatewayName: '${parCompanyPrefix}-vpngw-${parLocation}'
parExpressRouteGatewayName: '${parCompanyPrefix}-ergw-${parLocation}'
parAzFirewallName: '${parCompanyPrefix}-fw-${parLocation}'
parVirtualWanHubName: '${parCompanyPrefix}-vhub'
parVpnGatewayName: '${parCompanyPrefix}-vpngw'
parExpressRouteGatewayName: '${parCompanyPrefix}-ergw'
parAzFirewallName: '${parCompanyPrefix}-fw'
parAzFirewallAvailabilityZones: [
'1'
'2'
Expand All @@ -45,9 +50,9 @@ module minimum_vwan_conn '../vwanConnectivity.bicep' = {

parExpressRouteGatewayScaleUnit: 1

parDdosEnabled: true
parDdosEnabled: false
jtracey93 marked this conversation as resolved.
Show resolved Hide resolved
parDdosPlanName: '${parCompanyPrefix}-ddos-plan'
parPrivateDnsZonesEnabled: true
parPrivateDnsZonesEnabled: false
jtracey93 marked this conversation as resolved.
Show resolved Hide resolved

parPrivateDnsZonesResourceGroup: resourceGroup().name
parPrivateDnsZones: [
Expand Down
Loading