Changed 'natGateway' to 'managedNatGateway' to align with current exa…

…mples
Azure · Aug 8, 2024 · 628d916 · 628d916
1 parent 88149a9
commit 628d916
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 30 deletions.
diff --git a/bicep/main.bicep b/bicep/main.bicep
@@ -1057,7 +1057,7 @@ param AutoscaleProfile object = {
 
 @allowed([
   'loadBalancer'
-  'natGateway'
+  'managedNatGateway'
   'userDefinedRouting'
 ])
 @description('Outbound traffic type for the egress traffic of your cluster')

diff --git a/helper/.playwrighttests/helper-test-managednatgw.spec.js b/helper/.playwrighttests/helper-test-managednatgw.spec.js
@@ -37,7 +37,7 @@ test('managed-natgw-option-is-now-the-prod-default', async ({ page }) => {
   await page.waitForSelector('[data-testid="deploy-deploycmd"]')
   const clitextbox = await page.$('[data-testid="deploy-deploycmd"]')
   await expect(clitextbox).toBeVisible()
-  await expect(clitextbox).not.toContainText('natGateway')
+  await expect(clitextbox).not.toContainText('managedNatGateway')
 
 });
 

diff --git a/helper/src/components/deployTab.js b/helper/src/components/deployTab.js
@@ -118,12 +118,12 @@ export default function DeployTab({ defaults, updateFn, tabValues, invalidArray,
       ...(cluster.keyVaultKms === "public" && {keyVaultKmsCreate: true, keyVaultKmsOfficerRolePrincipalId: "$(az ad signed-in-user show --query id --out tsv)"}),
       ...(cluster.keyVaultKms === "byoprivate" && cluster.keyVaultKmsByoKeyId !== '' &&  cluster.keyVaultKmsByoRG !== '' && {keyVaultKmsByoKeyId: cluster.keyVaultKmsByoKeyId, keyVaultKmsByoRG: cluster.keyVaultKmsByoRG}),
     }),
-    ...(net.vnet_opt === "default" && net.aksOutboundTrafficType === 'natGateway' && {
+    ...(net.vnet_opt === "default" && net.aksOutboundTrafficType === 'managedNatGateway' && {
       ...(net.aksOutboundTrafficType !== defaults.net.aksOutboundTrafficType && {aksOutboundTrafficType: net.aksOutboundTrafficType}),
       ...(net.natGwIpCount !== defaults.net.natGwIpCount && {natGwIpCount: net.natGwIpCount}),
       ...(net.natGwIdleTimeout !== defaults.net.natGwIdleTimeout && {natGwIdleTimeout: net.natGwIdleTimeout})
     }),
-    ...(net.vnet_opt === "custom" && net.aksOutboundTrafficType === 'natGateway' && {
+    ...(net.vnet_opt === "custom" && net.aksOutboundTrafficType === 'managedNatGateway' && {
       ...({createNatGateway: true}),
       ...(net.aksOutboundTrafficType !== defaults.net.aksOutboundTrafficType && {aksOutboundTrafficType: net.aksOutboundTrafficType}),
       ...(net.natGwIpCount !== defaults.net.natGwIpCount && {natGwIpCount: net.natGwIpCount}),

diff --git a/helper/src/components/networkTab.js b/helper/src/components/networkTab.js
@@ -184,7 +184,7 @@ export default function NetworkTab ({ defaults, tabValues, updateFn, invalidArra
                             data-testid="net-aksEgressType"
                             options={[
                                 { key: 'loadBalancer', text: 'Load Balancer'  },
-                                { key: 'natGateway', text: 'NAT Gateway' },
+                                { key: 'managedNatGateway', text: 'Managed NAT Gateway' },
                                 { key: 'userDefinedRouting', text: 'User Defined Routing'}
                             ]}
                             onChange={(ev, { key }) => updateFn("aksOutboundTrafficType", key)}
@@ -193,7 +193,7 @@ export default function NetworkTab ({ defaults, tabValues, updateFn, invalidArra
                     <Stack.Item>
                         <Checkbox //simple "read-only" checkbox that derives its values from other settings
                             styles={{ root: { marginBottom: '10px' }}}
-                            checked={net.vnet_opt === 'custom' && net.aksOutboundTrafficType === 'natGateway'}
+                            checked={net.vnet_opt === 'custom' && net.aksOutboundTrafficType === 'managedNatGateway'}
                             disabled={true}
                             label="Create NAT Gateway for AKS Subnet (Custom VNet Only)"
                         />

diff --git a/samples/SampleAppMain.json b/samples/SampleAppMain.json
@@ -2178,12 +2178,12 @@
                     "aks_subnet_name": "aks-sn",
                     "aks_baseSubnet": {
                       "name": "[variables('aks_subnet_name')]",
-                      "properties": "[union(createObject('addressPrefix', parameters('vnetAksSubnetAddressPrefix')), if(parameters('privateLinks'), createObject('privateEndpointNetworkPolicies', 'Disabled', 'privateLinkServiceNetworkPolicies', 'Enabled'), createObject()), if(parameters('natGateway'), createObject('natGateway', createObject('id', resourceId('Microsoft.Network/natGateways', variables('natGwName')))), createObject()), if(parameters('azureFirewalls'), createObject('routeTable', createObject('id', resourceId('Microsoft.Network/routeTables', variables('routeFwTableName')))), createObject()))]"
+                      "properties": "[union(createObject('addressPrefix', parameters('vnetAksSubnetAddressPrefix')), if(parameters('privateLinks'), createObject('privateEndpointNetworkPolicies', 'Disabled', 'privateLinkServiceNetworkPolicies', 'Enabled'), createObject()), if(parameters('managedNatGateway'), createObject('managedNatGateway', createObject('id', resourceId('Microsoft.Network/natGateways', variables('natGwName')))), createObject()), if(parameters('azureFirewalls'), createObject('routeTable', createObject('id', resourceId('Microsoft.Network/routeTables', variables('routeFwTableName')))), createObject()))]"
                     },
                     "aks_podSubnet_name": "aks-pods-sn",
                     "aks_podSubnet": {
                       "name": "[variables('aks_podSubnet_name')]",
-                      "properties": "[union(createObject('addressPrefix', parameters('vnetPodAddressPrefix')), if(parameters('privateLinks'), createObject('privateEndpointNetworkPolicies', 'Disabled', 'privateLinkServiceNetworkPolicies', 'Enabled'), createObject()), if(parameters('natGateway'), createObject('natGateway', createObject('id', resourceId('Microsoft.Network/natGateways', variables('natGwName')))), createObject()), if(parameters('azureFirewalls'), createObject('routeTable', createObject('id', resourceId('Microsoft.Network/routeTables', variables('routeFwTableName')))), createObject()))]"
+                      "properties": "[union(createObject('addressPrefix', parameters('vnetPodAddressPrefix')), if(parameters('privateLinks'), createObject('privateEndpointNetworkPolicies', 'Disabled', 'privateLinkServiceNetworkPolicies', 'Enabled'), createObject()), if(parameters('managedNatGateway'), createObject('managedNatGateway', createObject('id', resourceId('Microsoft.Network/natGateways', variables('natGwName')))), createObject()), if(parameters('azureFirewalls'), createObject('routeTable', createObject('id', resourceId('Microsoft.Network/routeTables', variables('routeFwTableName')))), createObject()))]"
                     },
                     "vnetName": "[format('vnet-{0}', parameters('resourceName'))]",
                     "privateLinkAcrName": "[format('pl-acr-{0}', parameters('resourceName'))]",
@@ -2463,7 +2463,7 @@
                         "name": "natGwIp",
                         "count": "[length(range(0, parameters('natGatewayPublicIps')))]"
                       },
-                      "condition": "[parameters('natGateway')]",
+                      "condition": "[parameters('managedNatGateway')]",
                       "type": "Microsoft.Network/publicIPAddresses",
                       "apiVersion": "2021-08-01",
                       "name": "[format('pip-{0}-{1}', variables('natGwName'), add(range(0, parameters('natGatewayPublicIps'))[copyIndex()], 1))]",
@@ -2477,7 +2477,7 @@
                       }
                     },
                     {
-                      "condition": "[parameters('natGateway')]",
+                      "condition": "[parameters('managedNatGateway')]",
                       "type": "Microsoft.Network/natGateways",
                       "apiVersion": "2021-08-01",
                       "name": "[variables('natGwName')]",

diff --git a/samples/SystemPresetExample.json b/samples/SystemPresetExample.json
@@ -2120,12 +2120,12 @@
                     "aks_subnet_name": "aks-sn",
                     "aks_baseSubnet": {
                       "name": "[variables('aks_subnet_name')]",
-                      "properties": "[union(createObject('addressPrefix', parameters('vnetAksSubnetAddressPrefix')), if(parameters('privateLinks'), createObject('privateEndpointNetworkPolicies', 'Disabled', 'privateLinkServiceNetworkPolicies', 'Enabled'), createObject()), if(parameters('natGateway'), createObject('natGateway', createObject('id', resourceId('Microsoft.Network/natGateways', variables('natGwName')))), createObject()), if(parameters('azureFirewalls'), createObject('routeTable', createObject('id', resourceId('Microsoft.Network/routeTables', variables('routeFwTableName')))), createObject()))]"
+                      "properties": "[union(createObject('addressPrefix', parameters('vnetAksSubnetAddressPrefix')), if(parameters('privateLinks'), createObject('privateEndpointNetworkPolicies', 'Disabled', 'privateLinkServiceNetworkPolicies', 'Enabled'), createObject()), if(parameters('managedNatGateway'), createObject('managedNatGateway', createObject('id', resourceId('Microsoft.Network/natGateways', variables('natGwName')))), createObject()), if(parameters('azureFirewalls'), createObject('routeTable', createObject('id', resourceId('Microsoft.Network/routeTables', variables('routeFwTableName')))), createObject()))]"
                     },
                     "aks_podSubnet_name": "aks-pods-sn",
                     "aks_podSubnet": {
                       "name": "[variables('aks_podSubnet_name')]",
-                      "properties": "[union(createObject('addressPrefix', parameters('vnetPodAddressPrefix')), if(parameters('privateLinks'), createObject('privateEndpointNetworkPolicies', 'Disabled', 'privateLinkServiceNetworkPolicies', 'Enabled'), createObject()), if(parameters('natGateway'), createObject('natGateway', createObject('id', resourceId('Microsoft.Network/natGateways', variables('natGwName')))), createObject()), if(parameters('azureFirewalls'), createObject('routeTable', createObject('id', resourceId('Microsoft.Network/routeTables', variables('routeFwTableName')))), createObject()))]"
+                      "properties": "[union(createObject('addressPrefix', parameters('vnetPodAddressPrefix')), if(parameters('privateLinks'), createObject('privateEndpointNetworkPolicies', 'Disabled', 'privateLinkServiceNetworkPolicies', 'Enabled'), createObject()), if(parameters('managedNatGateway'), createObject('managedNatGateway', createObject('id', resourceId('Microsoft.Network/natGateways', variables('natGwName')))), createObject()), if(parameters('azureFirewalls'), createObject('routeTable', createObject('id', resourceId('Microsoft.Network/routeTables', variables('routeFwTableName')))), createObject()))]"
                     },
                     "vnetName": "[format('vnet-{0}', parameters('resourceName'))]",
                     "privateLinkAcrName": "[format('pl-acr-{0}', parameters('resourceName'))]",
@@ -2405,7 +2405,7 @@
                         "name": "natGwIp",
                         "count": "[length(range(0, parameters('natGatewayPublicIps')))]"
                       },
-                      "condition": "[parameters('natGateway')]",
+                      "condition": "[parameters('managedNatGateway')]",
                       "type": "Microsoft.Network/publicIPAddresses",
                       "apiVersion": "2021-08-01",
                       "name": "[format('pip-{0}-{1}', variables('natGwName'), add(range(0, parameters('natGatewayPublicIps'))[copyIndex()], 1))]",
@@ -2419,7 +2419,7 @@
                       }
                     },
                     {
-                      "condition": "[parameters('natGateway')]",
+                      "condition": "[parameters('managedNatGateway')]",
                       "type": "Microsoft.Network/natGateways",
                       "apiVersion": "2021-08-01",
                       "name": "[variables('natGwName')]",

diff --git a/samples/networkforbyo.json b/samples/networkforbyo.json
@@ -287,12 +287,12 @@
             "aks_subnet_name": "aks-sn",
             "aks_baseSubnet": {
               "name": "[variables('aks_subnet_name')]",
-              "properties": "[union(createObject('addressPrefix', parameters('vnetAksSubnetAddressPrefix')), if(parameters('privateLinks'), createObject('privateEndpointNetworkPolicies', 'Disabled', 'privateLinkServiceNetworkPolicies', 'Enabled'), createObject()), if(parameters('natGateway'), createObject('natGateway', createObject('id', resourceId('Microsoft.Network/natGateways', variables('natGwName')))), createObject()), if(parameters('azureFirewalls'), createObject('routeTable', createObject('id', resourceId('Microsoft.Network/routeTables', variables('routeFwTableName')))), createObject()))]"
+              "properties": "[union(createObject('addressPrefix', parameters('vnetAksSubnetAddressPrefix')), if(parameters('privateLinks'), createObject('privateEndpointNetworkPolicies', 'Disabled', 'privateLinkServiceNetworkPolicies', 'Enabled'), createObject()), if(parameters('managedNatGateway'), createObject('managedNatGateway', createObject('id', resourceId('Microsoft.Network/natGateways', variables('natGwName')))), createObject()), if(parameters('azureFirewalls'), createObject('routeTable', createObject('id', resourceId('Microsoft.Network/routeTables', variables('routeFwTableName')))), createObject()))]"
             },
             "aks_podSubnet_name": "aks-pods-sn",
             "aks_podSubnet": {
               "name": "[variables('aks_podSubnet_name')]",
-              "properties": "[union(createObject('addressPrefix', parameters('vnetPodAddressPrefix')), if(parameters('privateLinks'), createObject('privateEndpointNetworkPolicies', 'Disabled', 'privateLinkServiceNetworkPolicies', 'Enabled'), createObject()), if(parameters('natGateway'), createObject('natGateway', createObject('id', resourceId('Microsoft.Network/natGateways', variables('natGwName')))), createObject()), if(parameters('azureFirewalls'), createObject('routeTable', createObject('id', resourceId('Microsoft.Network/routeTables', variables('routeFwTableName')))), createObject()))]"
+              "properties": "[union(createObject('addressPrefix', parameters('vnetPodAddressPrefix')), if(parameters('privateLinks'), createObject('privateEndpointNetworkPolicies', 'Disabled', 'privateLinkServiceNetworkPolicies', 'Enabled'), createObject()), if(parameters('managedNatGateway'), createObject('managedNatGateway', createObject('id', resourceId('Microsoft.Network/natGateways', variables('natGwName')))), createObject()), if(parameters('azureFirewalls'), createObject('routeTable', createObject('id', resourceId('Microsoft.Network/routeTables', variables('routeFwTableName')))), createObject()))]"
             },
             "vnetName": "[format('vnet-{0}', parameters('resourceName'))]",
             "privateLinkAcrName": "[format('pl-acr-{0}', parameters('resourceName'))]",
@@ -572,7 +572,7 @@
                 "name": "natGwIp",
                 "count": "[length(range(0, parameters('natGatewayPublicIps')))]"
               },
-              "condition": "[parameters('natGateway')]",
+              "condition": "[parameters('managedNatGateway')]",
               "type": "Microsoft.Network/publicIPAddresses",
               "apiVersion": "2021-08-01",
               "name": "[format('pip-{0}-{1}', variables('natGwName'), add(range(0, parameters('natGatewayPublicIps'))[copyIndex()], 1))]",
@@ -586,7 +586,7 @@
               }
             },
             {
-              "condition": "[parameters('natGateway')]",
+              "condition": "[parameters('managedNatGateway')]",
               "type": "Microsoft.Network/natGateways",
               "apiVersion": "2021-08-01",
               "name": "[variables('natGwName')]",