- Changed default outbound type to loadBalancer for pipeline tests

- Reverting previous changes to `managedNATGatewayProfile` JSON snippets
Azure · Aug 9, 2024 · 0ebae28 · 0ebae28
1 parent f88131f
commit 0ebae28
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 25 deletions.
diff --git a/.github/workflows_dep/AksDeploy-Private.parameters.json b/.github/workflows_dep/AksDeploy-Private.parameters.json
@@ -93,7 +93,7 @@
             "value": true
           },
           "aksOutboundTrafficType" : {
-              "value": "natGateway"
+              "value": "loadBalancer"
           },
           "createNatGateway" : {
               "value": true

diff --git a/samples/SampleAppMain.json b/samples/SampleAppMain.json
@@ -1197,13 +1197,11 @@
             "aks_addons1": "[if(parameters('ingressApplicationGateway'), union(variables('aks_addons'), if(variables('deployAppGw'), createObject('ingressApplicationGateway', createObject('config', createObject('applicationGatewayId', resourceId('Microsoft.Network/applicationGateways', variables('appgwName'))), 'enabled', true())), createObject('ingressApplicationGateway', createObject('enabled', true(), 'config', createObject('applicationGatewayName', variables('appgwName'), 'subnetCIDR', '10.225.0.0/16'))))), variables('aks_addons'))]",
             "aksPrivateDnsZone": "[if(equals(parameters('privateClusterDnsMethod'), 'privateDnsZone'), if(not(empty(parameters('dnsApiPrivateZoneId'))), parameters('dnsApiPrivateZoneId'), 'system'), parameters('privateClusterDnsMethod'))]",
             "managedNATGatewayProfile": {
-              "networkProfile": {
-                "natGatewayProfile": {
-                  "managedOutboundIPProfile": {
-                    "count": "[parameters('natGwIpCount')]"
-                  },
-                  "idleTimeoutInMinutes": "[parameters('natGwIdleTimeout')]"
-                }
+              "natGatewayProfile": {
+                "managedOutboundIPProfile": {
+                  "count": "[parameters('natGwIpCount')]"
+                },
+                "idleTimeoutInMinutes": "[parameters('natGwIdleTimeout')]"
               }
             },
             "azureDefenderSecurityProfile": {

diff --git a/samples/SystemPresetExample.json b/samples/SystemPresetExample.json
@@ -1139,13 +1139,11 @@
             "aks_addons1": "[if(parameters('ingressApplicationGateway'), union(variables('aks_addons'), if(variables('deployAppGw'), createObject('ingressApplicationGateway', createObject('config', createObject('applicationGatewayId', resourceId('Microsoft.Network/applicationGateways', variables('appgwName'))), 'enabled', true())), createObject('ingressApplicationGateway', createObject('enabled', true(), 'config', createObject('applicationGatewayName', variables('appgwName'), 'subnetCIDR', '10.225.0.0/16'))))), variables('aks_addons'))]",
             "aksPrivateDnsZone": "[if(equals(parameters('privateClusterDnsMethod'), 'privateDnsZone'), if(not(empty(parameters('dnsApiPrivateZoneId'))), parameters('dnsApiPrivateZoneId'), 'system'), parameters('privateClusterDnsMethod'))]",
             "managedNATGatewayProfile": {
-              "networkProfile": {
-                "natGatewayProfile": {
-                  "managedOutboundIPProfile": {
-                    "count": "[parameters('natGwIpCount')]"
-                  },
-                  "idleTimeoutInMinutes": "[parameters('natGwIdleTimeout')]"
-                }
+              "natGatewayProfile": {
+                "managedOutboundIPProfile": {
+                  "count": "[parameters('natGwIpCount')]"
+                },
+                "idleTimeoutInMinutes": "[parameters('natGwIdleTimeout')]"
               }
             },
             "azureDefenderSecurityProfile": {

diff --git a/samples/shared-acr/main.json b/samples/shared-acr/main.json
@@ -1164,16 +1164,14 @@
             "aks_addons": "[union(createObject('azurepolicy', createObject('config', createObject('version', if(not(empty(parameters('azurepolicy'))), 'v2', json('null'))), 'enabled', not(empty(parameters('azurepolicy')))), 'azureKeyvaultSecretsProvider', createObject('config', createObject('enableSecretRotation', 'true', 'rotationPollInterval', parameters('keyVaultAksCSIPollInterval')), 'enabled', parameters('keyVaultAksCSI')), 'openServiceMesh', createObject('enabled', parameters('openServiceMeshAddon'), 'config', createObject()), 'ACCSGXDevicePlugin', createObject('enabled', parameters('sgxPlugin'), 'config', createObject())), if(and(variables('createLaw'), parameters('omsagent')), createObject('omsagent', createObject('enabled', and(variables('createLaw'), parameters('omsagent')), 'config', createObject('logAnalyticsWorkspaceResourceID', if(and(variables('createLaw'), parameters('omsagent')), resourceId('Microsoft.OperationalInsights/workspaces', variables('aks_law_name')), json('null'))))), createObject()))]",
             "aks_addons1": "[if(parameters('ingressApplicationGateway'), union(variables('aks_addons'), if(variables('deployAppGw'), createObject('ingressApplicationGateway', createObject('config', createObject('applicationGatewayId', resourceId('Microsoft.Network/applicationGateways', variables('appgwName'))), 'enabled', true())), createObject('ingressApplicationGateway', createObject('enabled', true(), 'config', createObject('applicationGatewayName', variables('appgwName'), 'subnetCIDR', '10.225.0.0/16'))))), variables('aks_addons'))]",
             "aksPrivateDnsZone": "[if(equals(parameters('privateClusterDnsMethod'), 'privateDnsZone'), if(not(empty(parameters('dnsApiPrivateZoneId'))), parameters('dnsApiPrivateZoneId'), 'system'), parameters('privateClusterDnsMethod'))]",
-            // "managedNATGatewayProfile": {
-            //   "networkProfile": {
-            //     "natGatewayProfile": {
-            //       "managedOutboundIPProfile": {
-            //         "count": "[parameters('natGwIpCount')]"
-            //       },
-            //       "idleTimeoutInMinutes": "[parameters('natGwIdleTimeout')]"
-            //     }
-            //   }
-            // },
+            "managedNATGatewayProfile": {
+              "natGatewayProfile": {
+                "managedOutboundIPProfile": {
+                  "count": "[parameters('natGwIpCount')]"
+                },
+                "idleTimeoutInMinutes": "[parameters('natGwIdleTimeout')]"
+              }
+            },
             "azureDefenderSecurityProfile": {
               "securityProfile": {
                 "defender": {