From 0ebae289d5206693be13b63f372d35385cd5ee78 Mon Sep 17 00:00:00 2001 From: Paul Lewis Date: Fri, 9 Aug 2024 18:16:04 +0000 Subject: [PATCH] - Changed default outbound type to loadBalancer for pipeline tests - Reverting previous changes to `managedNATGatewayProfile` JSON snippets --- .../AksDeploy-Private.parameters.json | 2 +- samples/SampleAppMain.json | 12 +++++------- samples/SystemPresetExample.json | 12 +++++------- samples/shared-acr/main.json | 18 ++++++++---------- 4 files changed, 19 insertions(+), 25 deletions(-) diff --git a/.github/workflows_dep/AksDeploy-Private.parameters.json b/.github/workflows_dep/AksDeploy-Private.parameters.json index a21c71a1c..85689baca 100644 --- 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 index a1fc781f9..d2259a057 100644 --- 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 index 67c1f5561..ce798f360 100644 --- 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 index 96913f363..c8b8b16f5 100644 --- 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": {