Azure Firewall Parameter Error - Fixed (#572)

* Updated outputs for Private FQDN & Private DNS Zone * Updated if condition to be based on input param. * Updated to more complex operator condition. * Firewall SKU correction * Updated AKS version to 1.24.10 * aks version bump * Removed additional Plurals * Replaced more plurals smh * Correcting case. --------- Co-authored-by: owainow <[email protected]>
Azure · Apr 28, 2023 · 1f2ac91 · 1f2ac91
1 parent eaafb75
commit 1f2ac91
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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' &&
                     <MessageBar styles={{ root: { marginLeft: '50px', width:'500px', marginTop: '10px !important'}}} messageBarType={MessageBarType.warning}>Basic SKU is currently a preview service <Link href="https://learn.microsoft.com/en-gb/azure/firewall/deploy-firewall-basic-portal-policy#prerequisites">(*preview)</Link></MessageBar>
                 }
                 <Dropdown
                     styles={{ root: { marginLeft: '50px', width: '200px', marginTop: '10 !important' } }}
                     disabled={!net.afw}
                     label="Firewall SKU"
-                    onChange={(ev, { key }) => 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 }) {
                     </Stack.Item>
 
                     <Stack.Item style={{ marginLeft: "20px"}}>
-                        <TextField prefix="Cidr" disabled={!net.afw || net.azureFirewallsSku!=='Basic'} label="Azure Firewall management subnet" onChange={(ev, val) => updateFn("vnetFirewallManagementSubnetAddressPrefix", val)} value={net.afw ? (net.azureFirewallsSku==='Basic' ? net.vnetFirewallManagementSubnetAddressPrefix : 'Management subnet for Basic SKU') : "No Firewall requested"} />
+                        <TextField prefix="Cidr" disabled={!net.afw || net.azureFirewallSku!=='Basic'} label="Azure Firewall management subnet" onChange={(ev, val) => updateFn("vnetFirewallManagementSubnetAddressPrefix", val)} value={net.afw ? (net.azureFirewallSku==='Basic' ? net.vnetFirewallManagementSubnetAddressPrefix : 'Management subnet for Basic SKU') : "No Firewall requested"} />
                     </Stack.Item>
 
                     <Stack.Item style={{ marginLeft: "20px"}}>

diff --git 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,