From 71475a0acb466201e15bb3936f4a80ed58a1e2bc Mon Sep 17 00:00:00 2001 From: ShiqianTao Date: Fri, 26 Aug 2022 12:22:05 +0800 Subject: [PATCH 1/3] AKS agent pool properties add AgentPoolWindowsProfile and DisableOutboundNAT --- ...PoolsCreate_WindowsDisableOutboundNAT.json | 63 +++++++++++++++++++ .../2022-08-02-preview/managedClusters.json | 18 ++++++ 2 files changed, 81 insertions(+) create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-08-02-preview/examples/AgentPoolsCreate_WindowsDisableOutboundNAT.json diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-08-02-preview/examples/AgentPoolsCreate_WindowsDisableOutboundNAT.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-08-02-preview/examples/AgentPoolsCreate_WindowsDisableOutboundNAT.json new file mode 100644 index 000000000000..fc86b0a74f05 --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-08-02-preview/examples/AgentPoolsCreate_WindowsDisableOutboundNAT.json @@ -0,0 +1,63 @@ +{ + "parameters": { + "api-version": "2022-08-02-preview", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "resourceName": "clustername1", + "agentPoolName": "wnp2", + "parameters": { + "properties": { + "orchestratorVersion": "1.23.8", + "count": 3, + "vmSize": "Standard_D4s_v3", + "osType": "Windows", + "osSKU": "Windows2022", + "windowsProfile": { + "disableOutboundNAT": true + } + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/wnp2", + "type": "Microsoft.ContainerService/managedClusters/agentPools", + "name": "wnp2", + "properties": { + "provisioningState": "Succeeded", + "orchestratorVersion": "1.23.8", + "currentOrchestratorVersion": "1.23.8", + "count": 3, + "vmSize": "Standard_D4s_v3", + "maxPods": 110, + "osType": "Windows", + "osSKU": "Windows2022", + "windowsProfile": { + "disableOutboundNAT": true + } + } + } + }, + "201": { + "body": { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/wnp2", + "type": "Microsoft.ContainerService/managedClusters/agentPools", + "name": "wnp2", + "properties": { + "provisioningState": "Creating", + "orchestratorVersion": "1.23.8", + "currentOrchestratorVersion": "1.23.8", + "count": 3, + "vmSize": "Standard_D4s_v3", + "maxPods": 110, + "osType": "Windows", + "osSKU": "Windows2022", + "windowsProfile": { + "disableOutboundNAT": true + } + } + } + } + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-08-02-preview/managedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-08-02-preview/managedClusters.json index 2bf0a6b2a0f6..2753ecbd6e58 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-08-02-preview/managedClusters.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-08-02-preview/managedClusters.json @@ -1112,6 +1112,9 @@ "Create Agent Pool with Windows OSSKU": { "$ref": "./examples/AgentPoolsCreate_WindowsOSSKU.json" }, + "Create Windows Agent Pool with disabling OutboundNAT": { + "$ref": "./examples/AgentPoolsCreate_WindowsDisableOutboundNAT.json" + }, "Create Agent Pool with GPUMIG": { "$ref": "./examples/AgentPoolsCreate_GPUMIG.json" }, @@ -3483,6 +3486,10 @@ }, "title": "The fully qualified resource ID of the Dedicated Host Group to provision virtual machines from, used only in creation scenario and not allowed to changed once set.", "description": "This is of the form: /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/hostGroups/{hostGroupName}. For more information see [Azure dedicated hosts](https://docs.microsoft.com/azure/virtual-machines/dedicated-hosts)." + }, + "windowsProfile": { + "$ref": "#/definitions/AgentPoolWindowsProfile", + "description": "The Windows agent pool's specific profile." } }, "description": "Properties for the container service agent pool profile." @@ -5781,6 +5788,17 @@ } } }, + "AgentPoolWindowsProfile": { + "type": "object", + "description": "The Windows agent pool's specific profile.", + "properties": { + "disableOutboundNAT": { + "type": "boolean", + "title": "Whether each Windows node disables OutboundNAT", + "description": "The default value is false. Allow disabling OutboundNAT only if the cluster outbound type is NAT Gateway and the Windows agent pool doesn't have node public IP enabled." + } + } + }, "SysctlConfig": { "description": "Sysctl settings for Linux agent nodes.", "type": "object", From 4baa21d3c39ea9400fb13402d13556a79ea304ec Mon Sep 17 00:00:00 2001 From: ShiqianTao Date: Fri, 26 Aug 2022 13:55:25 +0800 Subject: [PATCH 2/3] Change disableOutboundNAT to disableOutboundNat because of ARM format; Improve description. --- .../AgentPoolsCreate_WindowsDisableOutboundNAT.json | 6 +++--- .../preview/2022-08-02-preview/managedClusters.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-08-02-preview/examples/AgentPoolsCreate_WindowsDisableOutboundNAT.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-08-02-preview/examples/AgentPoolsCreate_WindowsDisableOutboundNAT.json index fc86b0a74f05..fcb81c3ca884 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-08-02-preview/examples/AgentPoolsCreate_WindowsDisableOutboundNAT.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-08-02-preview/examples/AgentPoolsCreate_WindowsDisableOutboundNAT.json @@ -13,7 +13,7 @@ "osType": "Windows", "osSKU": "Windows2022", "windowsProfile": { - "disableOutboundNAT": true + "disableOutboundNat": true } } } @@ -34,7 +34,7 @@ "osType": "Windows", "osSKU": "Windows2022", "windowsProfile": { - "disableOutboundNAT": true + "disableOutboundNat": true } } } @@ -54,7 +54,7 @@ "osType": "Windows", "osSKU": "Windows2022", "windowsProfile": { - "disableOutboundNAT": true + "disableOutboundNat": true } } } diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-08-02-preview/managedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-08-02-preview/managedClusters.json index 2753ecbd6e58..a4cdd5ffee56 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-08-02-preview/managedClusters.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-08-02-preview/managedClusters.json @@ -5792,9 +5792,9 @@ "type": "object", "description": "The Windows agent pool's specific profile.", "properties": { - "disableOutboundNAT": { + "disableOutboundNat": { "type": "boolean", - "title": "Whether each Windows node disables OutboundNAT", + "title": "Whether to disable OutboundNAT in windows nodes", "description": "The default value is false. Allow disabling OutboundNAT only if the cluster outbound type is NAT Gateway and the Windows agent pool doesn't have node public IP enabled." } } From 88bcd43fcb62c985072787761c782952fb64bc73 Mon Sep 17 00:00:00 2001 From: ShiqianTao Date: Sat, 27 Aug 2022 09:03:04 +0800 Subject: [PATCH 3/3] Improve description --- .../preview/2022-08-02-preview/managedClusters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-08-02-preview/managedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-08-02-preview/managedClusters.json index a4cdd5ffee56..1d196fb2012e 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-08-02-preview/managedClusters.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-08-02-preview/managedClusters.json @@ -5795,7 +5795,7 @@ "disableOutboundNat": { "type": "boolean", "title": "Whether to disable OutboundNAT in windows nodes", - "description": "The default value is false. Allow disabling OutboundNAT only if the cluster outbound type is NAT Gateway and the Windows agent pool doesn't have node public IP enabled." + "description": "The default value is false. Outbound NAT can only be disabled if the cluster outboundType is NAT Gateway and the Windows agent pool does not have node public IP enabled." } } },