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

Portal - Add Azure Firewall Management NIC and IP to Standard and Premium SKUs #1942

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Portal - Add Azure Firewall Management NIC and IP to Standard and Premium SKUs #1942

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a2161cf
fix: Update labels and visibility conditions for Azure Firewall Manag…
sebassem Mar 10, 2025
fdf3f0c
fix: Update managementIpConfiguration to always use azFwMgmtIpConfig …
sebassem Mar 10, 2025
11cb19d
fix: Simplify condition for Azure Firewall Management subnet configur…
sebassem Mar 10, 2025
4e73993
fix: Remove unnecessary newline in hubspoke-connectivity.json
sebassem Mar 10, 2025
8f852a4
Merge branch 'main' into firewall_mgmt_nic
arjenhuitema Mar 11, 2025
a0d4522
docs: Update Whats-new.md to include Azure Firewall management NIC de…
sebassem Mar 12, 2025
4ed7204
docs: Update Whats-new.md to clarify Azure Firewall management NIC de…
sebassem Mar 12, 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
8 changes: 4 additions & 4 deletions eslzArm/eslz-portal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2771,10 +2771,10 @@
{
"name": "subnetMaskForAzFwMgmt",
"type": "Microsoft.Common.TextBox",
"label": "Subnet for Azure Firewall Mgmt (Optional Only for Basic SKU)",
"label": "Subnet for Azure Firewall Mgmt",
"toolTip": "Provide address prefix in CIDR notation (e.g 10.100.0.0/26)",
"defaultValue": "10.100.2.0/24",
"visible": "[and(equals(steps('connectivity').enableAzFw, 'Yes'), equals(steps('connectivity').firewallSku, 'Basic'), not(equals(steps('connectivity').enableHub, 'vwan')))]",
"visible": "[and(equals(steps('connectivity').enableAzFw, 'Yes'), not(equals(steps('connectivity').enableHub, 'vwan')))]",
"constraints": {
"required": true,
"validations": [
Expand Down Expand Up @@ -3896,10 +3896,10 @@
{
"name": "subnetMaskForAzFwMgmtSecondary",
"type": "Microsoft.Common.TextBox",
"label": "Subnet for Azure Firewall Mgmt (Optional Only for Basic SKU) in your second region",
"label": "Subnet for Azure Firewall Mgmt in your second region",
"toolTip": "Provide address prefix in CIDR notation (e.g 10.200.0.0/26)",
"defaultValue": "10.200.2.0/24",
"visible": "[and(equals(steps('connectivity').esNetworkSecondarySubSection.enableAzFwSecondary, 'Yes'), equals(steps('connectivity').esNetworkSecondarySubSection.firewallSkuSecondary, 'Basic'), not(equals(steps('connectivity').enableHub, 'vwan')))]",
"visible": "[and(equals(steps('connectivity').esNetworkSecondarySubSection.enableAzFwSecondary, 'Yes'), not(equals(steps('connectivity').enableHub, 'vwan')))]",
"constraints": {
"required": true,
"validations": [
Expand Down
5 changes: 2 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 @@ -516,7 +516,7 @@
}
},
{
"condition": "[and(equals(parameters('enableAzFw'), 'Yes'), equals(parameters('firewallSku'), 'Basic'), not(empty(parameters('subnetMaskForAzFwMgmt'))))]",
"condition": "[and(equals(parameters('enableAzFw'), 'Yes'), not(empty(parameters('subnetMaskForAzFwMgmt'))))]",
"apiVersion": "2020-05-01",
"type": "Microsoft.Network/publicIpAddresses",
"name": "[variables('azFwMgmtIpName')]",
Expand All @@ -538,7 +538,6 @@
"dnsSettings": "[if(equals(parameters('enableAzFwDnsProxy'), 'Yes'), variables('azFirewallDnsSettings'), json('null'))]",
"sku": {
"tier": "[parameters('firewallSku')]"

}
}
},
Expand Down Expand Up @@ -574,7 +573,7 @@
}
}
],
"managementIpConfiguration": "[if(equals(parameters('firewallSku'), 'Basic'), variables('azFwMgmtIpConfig'), json('null'))]",
"managementIpConfiguration": "[variables('azFwMgmtIpConfig')]",
"firewallPolicy": "[variables('azFirewallPolicyId')]"
}
}
Expand Down
Loading