diff --git a/bicep/main.bicep b/bicep/main.bicep index a52917819..361d8cbe9 100644 --- a/bicep/main.bicep +++ b/bicep/main.bicep @@ -135,7 +135,7 @@ module network './network.bicep' = if (custom_vnet) { ingressApplicationGateway: ingressApplicationGateway vnetAppGatewaySubnetAddressPrefix: vnetAppGatewaySubnetAddressPrefix azureFirewalls: azureFirewalls - azureFirewallsSku: azureFirewallSku + azureFirewallSku: azureFirewallSku vnetFirewallSubnetAddressPrefix: vnetFirewallSubnetAddressPrefix vnetFirewallManagementSubnetAddressPrefix: vnetFirewallManagementSubnetAddressPrefix privateLinks: privateLinks diff --git a/bicep/network.bicep b/bicep/network.bicep index f3af62aa9..1a8e91019 100644 --- a/bicep/network.bicep +++ b/bicep/network.bicep @@ -14,8 +14,8 @@ param networkSecurityGroups bool = true //Firewall param azureFirewalls bool = false -param azureFirewallsSku string = 'Basic' -param azureFirewallsManagementSeperation bool = azureFirewalls && azureFirewallsSku=='Basic' +param azureFirewallSku string = 'Basic' +param azureFirewallsManagementSeperation bool = azureFirewalls && azureFirewallSku=='Basic' param vnetFirewallSubnetAddressPrefix string = '' param vnetFirewallManagementSubnetAddressPrefix string = '' diff --git a/helper/src/components/deployTab.js b/helper/src/components/deployTab.js index 3ef8bcf43..5b6863902 100644 --- a/helper/src/components/deployTab.js +++ b/helper/src/components/deployTab.js @@ -65,8 +65,8 @@ export default function DeployTab({ defaults, updateFn, tabValues, invalidArray, ]}) }), ...(net.afw && { azureFirewalls: true, ...(addons.certMan && {certManagerFW: true}), ...(net.vnet_opt === "custom" && defaults.net.vnetFirewallSubnetAddressPrefix !== net.vnetFirewallSubnetAddressPrefix && { vnetFirewallSubnetAddressPrefix: net.vnetFirewallSubnetAddressPrefix }) }), - ...(net.afw && net.azureFirewallsSku !== defaults.net.azureFirewallsSku && { azureFirewallsSku: net.azureFirewallsSku}), - ...(net.afw && net.vnetFirewallManagementSubnetAddressPrefix !== defaults.net.vnetFirewallManagementSubnetAddressPrefix && net.azureFirewallsSku==="Basic" && { vnetFirewallManagementSubnetAddressPrefix: net.vnetFirewallManagementSubnetAddressPrefix}), + ...(net.afw && net.azureFirewallSku !== defaults.net.azureFirewallSku && { azureFirewallSku: net.azureFirewallSku}), + ...(net.afw && net.vnetFirewallManagementSubnetAddressPrefix !== defaults.net.vnetFirewallManagementSubnetAddressPrefix && net.azureFirewallSku==="Basic" && { vnetFirewallManagementSubnetAddressPrefix: net.vnetFirewallManagementSubnetAddressPrefix}), ...(net.vnet_opt === "custom" && net.vnetprivateend && { privateLinks: true, ...(addons.csisecret === 'akvNew' && deploy.keyVaultIPAllowlist && apiips_array.length > 0 && {keyVaultIPAllowlist: apiips_array }), diff --git a/helper/src/components/networkTab.js b/helper/src/components/networkTab.js index 44ba0f5d9..b388de480 100644 --- a/helper/src/components/networkTab.js +++ b/helper/src/components/networkTab.js @@ -221,14 +221,14 @@ export default function NetworkTab ({ defaults, tabValues, updateFn, invalidArra onChange={(ev, v) => updateFn("afw", v)} label="Implement Azure Firewall & UDR next hop" /> - {net.azureFirewallsSku==='Basic' && + {net.azureFirewallSku==='Basic' && Basic SKU is currently a preview service (*preview) } updateFn("azureFirewallsSku", key)} selectedKey={net.azureFirewallsSku} + onChange={(ev, { key }) => updateFn("azureFirewallSku", key)} selectedKey={net.azureFirewallSku} options={[ { key: 'Basic', text: 'Basic' }, { key: 'Standard', text: 'Standard' }, @@ -450,7 +450,7 @@ function CustomVNET({ net, addons, updateFn, invalidArray }) { - updateFn("vnetFirewallManagementSubnetAddressPrefix", val)} value={net.afw ? (net.azureFirewallsSku==='Basic' ? net.vnetFirewallManagementSubnetAddressPrefix : 'Management subnet for Basic SKU') : "No Firewall requested"} /> + updateFn("vnetFirewallManagementSubnetAddressPrefix", val)} value={net.afw ? (net.azureFirewallSku==='Basic' ? net.vnetFirewallManagementSubnetAddressPrefix : 'Management subnet for Basic SKU') : "No Firewall requested"} /> diff --git a/helper/src/config.json b/helper/src/config.json index 08ee58063..80e6866b0 100644 --- a/helper/src/config.json +++ b/helper/src/config.json @@ -113,7 +113,7 @@ }, "net": { "vnetFirewallManagementSubnetAddressPrefix": "10.240.51.0/26", - "azureFirewallsSku": "Standard", + "azureFirewallSku": "Standard", "maxPods": 30, "cniDynamicIpAllocation": false, "networkPluginMode": false,