From c89e9adeae3328c79751c7ccfb612e4981fc20e2 Mon Sep 17 00:00:00 2001 From: Jianping Zeng Date: Sat, 22 Jan 2022 11:01:14 -0800 Subject: [PATCH 1/3] Add property HostGroupID and its examples --- .../AgentPoolsCreate_DedicatedHostGroup.json | 53 ++++ ...agedClustersCreate_DedicatedHostGroup.json | 252 ++++++++++++++++++ .../2022-01-02-preview/managedClusters.json | 14 + 3 files changed, 319 insertions(+) create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-01-02-preview/examples/AgentPoolsCreate_DedicatedHostGroup.json create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-01-02-preview/examples/ManagedClustersCreate_DedicatedHostGroup.json diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-01-02-preview/examples/AgentPoolsCreate_DedicatedHostGroup.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-01-02-preview/examples/AgentPoolsCreate_DedicatedHostGroup.json new file mode 100644 index 000000000000..f544c27c4e1b --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-01-02-preview/examples/AgentPoolsCreate_DedicatedHostGroup.json @@ -0,0 +1,53 @@ +{ + "parameters": { + "api-version": "2022-01-02-preview", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "resourceName": "clustername1", + "agentPoolName": "agentpool1", + "parameters": { + "properties": { + "orchestratorVersion": "", + "count": 3, + "vmSize": "Standard_DS2_v2", + "osType": "Linux", + "hostGroupID": "/subscriptions/subid1/resourcegroups/rg/providers/Microsoft.Compute/hostGroups/hostgroup1" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1", + "type": "Microsoft.ContainerService/managedClusters/agentPools", + "name": "agentpool1", + "properties": { + "provisioningState": "Succeeded", + "orchestratorVersion": "1.19.6", + "count": 3, + "vmSize": "Standard_DS2_v2", + "maxPods": 110, + "osType": "Linux", + "hostGroupID": "/subscriptions/subid1/resourcegroups/rg/providers/Microsoft.Compute/hostGroups/hostgroup1" + } + } + }, + "201": { + "body": { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1", + "type": "Microsoft.ContainerService/managedClusters/agentPools", + "name": "agentpool1", + "properties": { + "provisioningState": "Creating", + "orchestratorVersion": "1.19.6", + "count": 3, + "vmSize": "Standard_DS2_v2", + "maxPods": 110, + "osType": "Linux", + "hostGroupID": "/subscriptions/subid1/resourcegroups/rg/providers/Microsoft.Compute/hostGroups/hostgroup1" + } + } + } + } + } + \ No newline at end of file diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-01-02-preview/examples/ManagedClustersCreate_DedicatedHostGroup.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-01-02-preview/examples/ManagedClustersCreate_DedicatedHostGroup.json new file mode 100644 index 000000000000..97b169ff99ce --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-01-02-preview/examples/ManagedClustersCreate_DedicatedHostGroup.json @@ -0,0 +1,252 @@ +{ + "parameters": { + "api-version": "2022-01-02-preview", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "resourceName": "clustername1", + "parameters": { + "location": "location1", + "tags": { + "tier": "production", + "archv2": "" + }, + "sku": { + "name": "Basic", + "tier": "Free" + }, + "properties": { + "kubernetesVersion": "", + "dnsPrefix": "dnsprefix1", + "agentPoolProfiles": [ + { + "name": "nodepool1", + "count": 3, + "vmSize": "Standard_DS2_v2", + "osType": "Linux", + "type": "VirtualMachineScaleSets", + "enableNodePublicIP": true, + "hostGroupID": "/subscriptions/subid1/resourcegroups/rg/providers/Microsoft.Compute/hostGroups/hostgroup1" + } + ], + "linuxProfile": { + "adminUsername": "azureuser", + "ssh": { + "publicKeys": [ + { + "keyData": "keydata" + } + ] + } + }, + "networkProfile": { + "loadBalancerSku": "standard", + "outboundType": "loadBalancer", + "loadBalancerProfile": { + "managedOutboundIPs": { + "count": 2 + } + } + }, + "autoScalerProfile": { + "scan-interval": "20s", + "scale-down-delay-after-add": "15m" + }, + "windowsProfile": { + "adminUsername": "azureuser", + "adminPassword": "replacePassword1234$" + }, + "servicePrincipalProfile": { + "clientId": "clientid", + "secret": "secret" + }, + "addonProfiles": {}, + "enableRBAC": true, + "diskEncryptionSetID": "/subscriptions/subid1/resourceGroups/rg1/providers/Microsoft.Compute/diskEncryptionSets/des", + "enablePodSecurityPolicy": false + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1", + "location": "location1", + "name": "clustername1", + "tags": { + "archv2": "", + "tier": "production" + }, + "type": "Microsoft.ContainerService/ManagedClusters", + "properties": { + "provisioningState": "Succeeded", + "maxAgentPools": 1, + "kubernetesVersion": "1.9.6", + "dnsPrefix": "dnsprefix1", + "agentPoolProfiles": [ + { + "name": "nodepool1", + "count": 3, + "vmSize": "Standard_DS2_v2", + "maxPods": 110, + "osType": "Linux", + "provisioningState": "Succeeded", + "orchestratorVersion": "1.9.6", + "type": "VirtualMachineScaleSets", + "enableNodePublicIP": true, + "nodeImageVersion": "AKSUbuntu:1604:2020.03.11", + "hostGroupID": "/subscriptions/subid1/resourcegroups/rg/providers/Microsoft.Compute/hostGroups/hostgroup1" + } + ], + "linuxProfile": { + "adminUsername": "azureuser", + "ssh": { + "publicKeys": [ + { + "keyData": "keydata" + } + ] + } + }, + "windowsProfile": { + "adminUsername": "azureuser" + }, + "servicePrincipalProfile": { + "clientId": "clientid" + }, + "nodeResourceGroup": "MC_rg1_clustername1_location1", + "enableRBAC": true, + "diskEncryptionSetID": "/subscriptions/subid1/resourceGroups/rg1/providers/Microsoft.Compute/diskEncryptionSets/des", + "enablePodSecurityPolicy": false, + "fqdn": "dnsprefix1-abcd1234.hcp.eastus.azmk8s.io", + "networkProfile": { + "loadBalancerSku": "basic", + "networkPlugin": "kubenet", + "podCidr": "10.244.0.0/16", + "serviceCidr": "10.0.0.0/16", + "dnsServiceIP": "10.0.0.10", + "dockerBridgeCidr": "172.17.0.1/16", + "outboundType": "loadBalancer", + "podCidrs": [ + "10.244.0.0/16" + ], + "serviceCidrs": [ + "10.0.0.0/16" + ], + "ipFamilies": [ + "IPv4" + ], + "loadBalancerProfile": { + "allocatedOutboundPorts": 2000, + "idleTimeoutInMinutes": 10, + "managedOutboundIPs": { + "count": 2 + }, + "effectiveOutboundIPs": [ + { + "id": "/subscriptions/subid1/resourceGroups/MC_rg1/providers/Microsoft.Network/publicIPAddresses/mgdoutboundip1" + }, + { + "id": "/subscriptions/subid1/resourceGroups/MC_rg1/providers/Microsoft.Network/publicIPAddresses/mgdoutboundip2" + } + ] + } + }, + "autoScalerProfile": { + "scan-interval": "20s", + "scale-down-delay-after-add": "15m" + } + } + } + }, + "201": { + "body": { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1", + "location": "location1", + "name": "clustername1", + "tags": { + "archv2": "", + "tier": "production" + }, + "type": "Microsoft.ContainerService/ManagedClusters", + "properties": { + "provisioningState": "Creating", + "maxAgentPools": 1, + "kubernetesVersion": "1.9.6", + "dnsPrefix": "dnsprefix1", + "agentPoolProfiles": [ + { + "name": "nodepool1", + "count": 3, + "vmSize": "Standard_DS2_v2", + "maxPods": 110, + "osType": "Linux", + "provisioningState": "Creating", + "orchestratorVersion": "1.9.6", + "type": "VirtualMachineScaleSets", + "enableNodePublicIP": true, + "hostGroupID": "/subscriptions/subid1/resourcegroups/rg/providers/Microsoft.Compute/hostGroups/hostgroup1" + } + ], + "linuxProfile": { + "adminUsername": "azureuser", + "ssh": { + "publicKeys": [ + { + "keyData": "keydata" + } + ] + } + }, + "windowsProfile": { + "adminUsername": "azureuser" + }, + "servicePrincipalProfile": { + "clientId": "clientid" + }, + "nodeResourceGroup": "MC_rg1_clustername1_location1", + "enableRBAC": true, + "diskEncryptionSetID": "/subscriptions/subid1/resourceGroups/rg1/providers/Microsoft.Compute/diskEncryptionSets/des", + "enablePodSecurityPolicy": false, + "networkProfile": { + "networkPlugin": "kubenet", + "podCidr": "10.244.0.0/16", + "serviceCidr": "10.0.0.0/16", + "dnsServiceIP": "10.0.0.10", + "dockerBridgeCidr": "172.17.0.1/16", + "loadBalancerSku": "standard", + "outboundType": "loadBalancer", + "podCidrs": [ + "10.244.0.0/16" + ], + "serviceCidrs": [ + "10.0.0.0/16" + ], + "ipFamilies": [ + "IPv4" + ], + "loadBalancerProfile": { + "allocatedOutboundPorts": 2000, + "idleTimeoutInMinutes": 10, + "managedOutboundIPs": { + "count": 2 + }, + "effectiveOutboundIPs": [ + { + "id": "/subscriptions/subid1/resourceGroups/MC_rg1/providers/Microsoft.Network/publicIPAddresses/mgdoutboundip1" + }, + { + "id": "/subscriptions/subid1/resourceGroups/MC_rg1/providers/Microsoft.Network/publicIPAddresses/mgdoutboundip2" + } + ] + } + }, + "autoScalerProfile": { + "scan-interval": "20s", + "scale-down-delay-after-add": "15m" + } + } + } + } + } + } + \ No newline at end of file diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-01-02-preview/managedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-01-02-preview/managedClusters.json index 8cbf80608a67..4fe1dbb5edbf 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-01-02-preview/managedClusters.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-01-02-preview/managedClusters.json @@ -581,6 +581,9 @@ }, "Associate Managed Cluster with Capacity Reservation Group": { "$ref": "./examples/ManagedClustersAssociate_CRG.json" + }, + "Create Managed Cluster with Dedicated Host Group": { + "$ref": "./examples/ManagedClustersCreate_DedicatedHostGroup.json" } } }, @@ -1076,6 +1079,9 @@ }, "Associate Agent Pool with Capacity Reservation Group": { "$ref": "./examples/AgentPoolsAssociate_CRG.json" + }, + "Create Agent Pool with Dedicated Host Group": { + "$ref": "./examples/AgentPoolsCreate_DedicatedHostGroup.json" } } }, @@ -2823,6 +2829,10 @@ "capacityReservationGroupID": { "$ref": "#/definitions/CapacityReservationGroupID", "description": "AKS will associate the specified agent pool with the Capacity Reservation Group." + }, + "hostGroupID": { + "$ref": "#/definitions/HostGroupID", + "description": "The ID for Dedicated Host Group." } }, "description": "Properties for the container service agent pool profile." @@ -4729,6 +4739,10 @@ "type": "string", "description": "The ID for Proximity Placement Group." }, + "HostGroupID": { + "type": "string", + "description": "The ID for Dedicated Host Group." + }, "CredentialResults": { "properties": { "kubeconfigs": { From 359c6949a92ab5ee327d127e64527236a67c3762 Mon Sep 17 00:00:00 2001 From: Jianping Zeng Date: Sat, 22 Jan 2022 13:51:41 -0800 Subject: [PATCH 2/3] fix format issue --- .../AgentPoolsCreate_DedicatedHostGroup.json | 77 ++-- ...agedClustersCreate_DedicatedHostGroup.json | 395 +++++++++--------- 2 files changed, 235 insertions(+), 237 deletions(-) diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-01-02-preview/examples/AgentPoolsCreate_DedicatedHostGroup.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-01-02-preview/examples/AgentPoolsCreate_DedicatedHostGroup.json index f544c27c4e1b..5569d16ee137 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-01-02-preview/examples/AgentPoolsCreate_DedicatedHostGroup.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-01-02-preview/examples/AgentPoolsCreate_DedicatedHostGroup.json @@ -1,53 +1,52 @@ { + "parameters": { + "api-version": "2022-01-02-preview", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "resourceName": "clustername1", + "agentPoolName": "agentpool1", "parameters": { - "api-version": "2022-01-02-preview", - "subscriptionId": "subid1", - "resourceGroupName": "rg1", - "resourceName": "clustername1", - "agentPoolName": "agentpool1", - "parameters": { + "properties": { + "orchestratorVersion": "", + "count": 3, + "vmSize": "Standard_DS2_v2", + "osType": "Linux", + "hostGroupID": "/subscriptions/subid1/resourcegroups/rg/providers/Microsoft.Compute/hostGroups/hostgroup1" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1", + "type": "Microsoft.ContainerService/managedClusters/agentPools", + "name": "agentpool1", "properties": { - "orchestratorVersion": "", + "provisioningState": "Succeeded", + "orchestratorVersion": "1.19.6", "count": 3, "vmSize": "Standard_DS2_v2", + "maxPods": 110, "osType": "Linux", "hostGroupID": "/subscriptions/subid1/resourcegroups/rg/providers/Microsoft.Compute/hostGroups/hostgroup1" } } }, - "responses": { - "200": { - "body": { - "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1", - "type": "Microsoft.ContainerService/managedClusters/agentPools", - "name": "agentpool1", - "properties": { - "provisioningState": "Succeeded", - "orchestratorVersion": "1.19.6", - "count": 3, - "vmSize": "Standard_DS2_v2", - "maxPods": 110, - "osType": "Linux", - "hostGroupID": "/subscriptions/subid1/resourcegroups/rg/providers/Microsoft.Compute/hostGroups/hostgroup1" - } - } - }, - "201": { - "body": { - "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1", - "type": "Microsoft.ContainerService/managedClusters/agentPools", - "name": "agentpool1", - "properties": { - "provisioningState": "Creating", - "orchestratorVersion": "1.19.6", - "count": 3, - "vmSize": "Standard_DS2_v2", - "maxPods": 110, - "osType": "Linux", - "hostGroupID": "/subscriptions/subid1/resourcegroups/rg/providers/Microsoft.Compute/hostGroups/hostgroup1" - } + "201": { + "body": { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1", + "type": "Microsoft.ContainerService/managedClusters/agentPools", + "name": "agentpool1", + "properties": { + "provisioningState": "Creating", + "orchestratorVersion": "1.19.6", + "count": 3, + "vmSize": "Standard_DS2_v2", + "maxPods": 110, + "osType": "Linux", + "hostGroupID": "/subscriptions/subid1/resourcegroups/rg/providers/Microsoft.Compute/hostGroups/hostgroup1" } } } } - \ No newline at end of file +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-01-02-preview/examples/ManagedClustersCreate_DedicatedHostGroup.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-01-02-preview/examples/ManagedClustersCreate_DedicatedHostGroup.json index 97b169ff99ce..61bdfda0c23a 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-01-02-preview/examples/ManagedClustersCreate_DedicatedHostGroup.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-01-02-preview/examples/ManagedClustersCreate_DedicatedHostGroup.json @@ -1,30 +1,99 @@ { + "parameters": { + "api-version": "2022-01-02-preview", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "resourceName": "clustername1", "parameters": { - "api-version": "2022-01-02-preview", - "subscriptionId": "subid1", - "resourceGroupName": "rg1", - "resourceName": "clustername1", - "parameters": { + "location": "location1", + "tags": { + "tier": "production", + "archv2": "" + }, + "sku": { + "name": "Basic", + "tier": "Free" + }, + "properties": { + "kubernetesVersion": "", + "dnsPrefix": "dnsprefix1", + "agentPoolProfiles": [ + { + "name": "nodepool1", + "count": 3, + "vmSize": "Standard_DS2_v2", + "osType": "Linux", + "type": "VirtualMachineScaleSets", + "enableNodePublicIP": true, + "hostGroupID": "/subscriptions/subid1/resourcegroups/rg/providers/Microsoft.Compute/hostGroups/hostgroup1" + } + ], + "linuxProfile": { + "adminUsername": "azureuser", + "ssh": { + "publicKeys": [ + { + "keyData": "keydata" + } + ] + } + }, + "networkProfile": { + "loadBalancerSku": "standard", + "outboundType": "loadBalancer", + "loadBalancerProfile": { + "managedOutboundIPs": { + "count": 2 + } + } + }, + "autoScalerProfile": { + "scan-interval": "20s", + "scale-down-delay-after-add": "15m" + }, + "windowsProfile": { + "adminUsername": "azureuser", + "adminPassword": "replacePassword1234$" + }, + "servicePrincipalProfile": { + "clientId": "clientid", + "secret": "secret" + }, + "addonProfiles": {}, + "enableRBAC": true, + "diskEncryptionSetID": "/subscriptions/subid1/resourceGroups/rg1/providers/Microsoft.Compute/diskEncryptionSets/des", + "enablePodSecurityPolicy": false + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1", "location": "location1", + "name": "clustername1", "tags": { - "tier": "production", - "archv2": "" - }, - "sku": { - "name": "Basic", - "tier": "Free" + "archv2": "", + "tier": "production" }, + "type": "Microsoft.ContainerService/ManagedClusters", "properties": { - "kubernetesVersion": "", + "provisioningState": "Succeeded", + "maxAgentPools": 1, + "kubernetesVersion": "1.9.6", "dnsPrefix": "dnsprefix1", "agentPoolProfiles": [ { "name": "nodepool1", "count": 3, "vmSize": "Standard_DS2_v2", + "maxPods": 110, "osType": "Linux", + "provisioningState": "Succeeded", + "orchestratorVersion": "1.9.6", "type": "VirtualMachineScaleSets", "enableNodePublicIP": true, + "nodeImageVersion": "AKSUbuntu:1604:2020.03.11", "hostGroupID": "/subscriptions/subid1/resourcegroups/rg/providers/Microsoft.Compute/hostGroups/hostgroup1" } ], @@ -38,215 +107,145 @@ ] } }, + "windowsProfile": { + "adminUsername": "azureuser" + }, + "servicePrincipalProfile": { + "clientId": "clientid" + }, + "nodeResourceGroup": "MC_rg1_clustername1_location1", + "enableRBAC": true, + "diskEncryptionSetID": "/subscriptions/subid1/resourceGroups/rg1/providers/Microsoft.Compute/diskEncryptionSets/des", + "enablePodSecurityPolicy": false, + "fqdn": "dnsprefix1-abcd1234.hcp.eastus.azmk8s.io", "networkProfile": { - "loadBalancerSku": "standard", + "loadBalancerSku": "basic", + "networkPlugin": "kubenet", + "podCidr": "10.244.0.0/16", + "serviceCidr": "10.0.0.0/16", + "dnsServiceIP": "10.0.0.10", + "dockerBridgeCidr": "172.17.0.1/16", "outboundType": "loadBalancer", + "podCidrs": [ + "10.244.0.0/16" + ], + "serviceCidrs": [ + "10.0.0.0/16" + ], + "ipFamilies": [ + "IPv4" + ], "loadBalancerProfile": { + "allocatedOutboundPorts": 2000, + "idleTimeoutInMinutes": 10, "managedOutboundIPs": { "count": 2 - } + }, + "effectiveOutboundIPs": [ + { + "id": "/subscriptions/subid1/resourceGroups/MC_rg1/providers/Microsoft.Network/publicIPAddresses/mgdoutboundip1" + }, + { + "id": "/subscriptions/subid1/resourceGroups/MC_rg1/providers/Microsoft.Network/publicIPAddresses/mgdoutboundip2" + } + ] } }, "autoScalerProfile": { "scan-interval": "20s", "scale-down-delay-after-add": "15m" + } + } + } + }, + "201": { + "body": { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1", + "location": "location1", + "name": "clustername1", + "tags": { + "archv2": "", + "tier": "production" + }, + "type": "Microsoft.ContainerService/ManagedClusters", + "properties": { + "provisioningState": "Creating", + "maxAgentPools": 1, + "kubernetesVersion": "1.9.6", + "dnsPrefix": "dnsprefix1", + "agentPoolProfiles": [ + { + "name": "nodepool1", + "count": 3, + "vmSize": "Standard_DS2_v2", + "maxPods": 110, + "osType": "Linux", + "provisioningState": "Creating", + "orchestratorVersion": "1.9.6", + "type": "VirtualMachineScaleSets", + "enableNodePublicIP": true, + "hostGroupID": "/subscriptions/subid1/resourcegroups/rg/providers/Microsoft.Compute/hostGroups/hostgroup1" + } + ], + "linuxProfile": { + "adminUsername": "azureuser", + "ssh": { + "publicKeys": [ + { + "keyData": "keydata" + } + ] + } }, "windowsProfile": { - "adminUsername": "azureuser", - "adminPassword": "replacePassword1234$" + "adminUsername": "azureuser" }, "servicePrincipalProfile": { - "clientId": "clientid", - "secret": "secret" + "clientId": "clientid" }, - "addonProfiles": {}, + "nodeResourceGroup": "MC_rg1_clustername1_location1", "enableRBAC": true, "diskEncryptionSetID": "/subscriptions/subid1/resourceGroups/rg1/providers/Microsoft.Compute/diskEncryptionSets/des", - "enablePodSecurityPolicy": false - } - } - }, - "responses": { - "200": { - "body": { - "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1", - "location": "location1", - "name": "clustername1", - "tags": { - "archv2": "", - "tier": "production" - }, - "type": "Microsoft.ContainerService/ManagedClusters", - "properties": { - "provisioningState": "Succeeded", - "maxAgentPools": 1, - "kubernetesVersion": "1.9.6", - "dnsPrefix": "dnsprefix1", - "agentPoolProfiles": [ - { - "name": "nodepool1", - "count": 3, - "vmSize": "Standard_DS2_v2", - "maxPods": 110, - "osType": "Linux", - "provisioningState": "Succeeded", - "orchestratorVersion": "1.9.6", - "type": "VirtualMachineScaleSets", - "enableNodePublicIP": true, - "nodeImageVersion": "AKSUbuntu:1604:2020.03.11", - "hostGroupID": "/subscriptions/subid1/resourcegroups/rg/providers/Microsoft.Compute/hostGroups/hostgroup1" - } + "enablePodSecurityPolicy": false, + "networkProfile": { + "networkPlugin": "kubenet", + "podCidr": "10.244.0.0/16", + "serviceCidr": "10.0.0.0/16", + "dnsServiceIP": "10.0.0.10", + "dockerBridgeCidr": "172.17.0.1/16", + "loadBalancerSku": "standard", + "outboundType": "loadBalancer", + "podCidrs": [ + "10.244.0.0/16" ], - "linuxProfile": { - "adminUsername": "azureuser", - "ssh": { - "publicKeys": [ - { - "keyData": "keydata" - } - ] - } - }, - "windowsProfile": { - "adminUsername": "azureuser" - }, - "servicePrincipalProfile": { - "clientId": "clientid" - }, - "nodeResourceGroup": "MC_rg1_clustername1_location1", - "enableRBAC": true, - "diskEncryptionSetID": "/subscriptions/subid1/resourceGroups/rg1/providers/Microsoft.Compute/diskEncryptionSets/des", - "enablePodSecurityPolicy": false, - "fqdn": "dnsprefix1-abcd1234.hcp.eastus.azmk8s.io", - "networkProfile": { - "loadBalancerSku": "basic", - "networkPlugin": "kubenet", - "podCidr": "10.244.0.0/16", - "serviceCidr": "10.0.0.0/16", - "dnsServiceIP": "10.0.0.10", - "dockerBridgeCidr": "172.17.0.1/16", - "outboundType": "loadBalancer", - "podCidrs": [ - "10.244.0.0/16" - ], - "serviceCidrs": [ - "10.0.0.0/16" - ], - "ipFamilies": [ - "IPv4" - ], - "loadBalancerProfile": { - "allocatedOutboundPorts": 2000, - "idleTimeoutInMinutes": 10, - "managedOutboundIPs": { - "count": 2 - }, - "effectiveOutboundIPs": [ - { - "id": "/subscriptions/subid1/resourceGroups/MC_rg1/providers/Microsoft.Network/publicIPAddresses/mgdoutboundip1" - }, - { - "id": "/subscriptions/subid1/resourceGroups/MC_rg1/providers/Microsoft.Network/publicIPAddresses/mgdoutboundip2" - } - ] - } - }, - "autoScalerProfile": { - "scan-interval": "20s", - "scale-down-delay-after-add": "15m" - } - } - } - }, - "201": { - "body": { - "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1", - "location": "location1", - "name": "clustername1", - "tags": { - "archv2": "", - "tier": "production" - }, - "type": "Microsoft.ContainerService/ManagedClusters", - "properties": { - "provisioningState": "Creating", - "maxAgentPools": 1, - "kubernetesVersion": "1.9.6", - "dnsPrefix": "dnsprefix1", - "agentPoolProfiles": [ - { - "name": "nodepool1", - "count": 3, - "vmSize": "Standard_DS2_v2", - "maxPods": 110, - "osType": "Linux", - "provisioningState": "Creating", - "orchestratorVersion": "1.9.6", - "type": "VirtualMachineScaleSets", - "enableNodePublicIP": true, - "hostGroupID": "/subscriptions/subid1/resourcegroups/rg/providers/Microsoft.Compute/hostGroups/hostgroup1" - } + "serviceCidrs": [ + "10.0.0.0/16" ], - "linuxProfile": { - "adminUsername": "azureuser", - "ssh": { - "publicKeys": [ - { - "keyData": "keydata" - } - ] - } - }, - "windowsProfile": { - "adminUsername": "azureuser" - }, - "servicePrincipalProfile": { - "clientId": "clientid" - }, - "nodeResourceGroup": "MC_rg1_clustername1_location1", - "enableRBAC": true, - "diskEncryptionSetID": "/subscriptions/subid1/resourceGroups/rg1/providers/Microsoft.Compute/diskEncryptionSets/des", - "enablePodSecurityPolicy": false, - "networkProfile": { - "networkPlugin": "kubenet", - "podCidr": "10.244.0.0/16", - "serviceCidr": "10.0.0.0/16", - "dnsServiceIP": "10.0.0.10", - "dockerBridgeCidr": "172.17.0.1/16", - "loadBalancerSku": "standard", - "outboundType": "loadBalancer", - "podCidrs": [ - "10.244.0.0/16" - ], - "serviceCidrs": [ - "10.0.0.0/16" - ], - "ipFamilies": [ - "IPv4" - ], - "loadBalancerProfile": { - "allocatedOutboundPorts": 2000, - "idleTimeoutInMinutes": 10, - "managedOutboundIPs": { - "count": 2 + "ipFamilies": [ + "IPv4" + ], + "loadBalancerProfile": { + "allocatedOutboundPorts": 2000, + "idleTimeoutInMinutes": 10, + "managedOutboundIPs": { + "count": 2 + }, + "effectiveOutboundIPs": [ + { + "id": "/subscriptions/subid1/resourceGroups/MC_rg1/providers/Microsoft.Network/publicIPAddresses/mgdoutboundip1" }, - "effectiveOutboundIPs": [ - { - "id": "/subscriptions/subid1/resourceGroups/MC_rg1/providers/Microsoft.Network/publicIPAddresses/mgdoutboundip1" - }, - { - "id": "/subscriptions/subid1/resourceGroups/MC_rg1/providers/Microsoft.Network/publicIPAddresses/mgdoutboundip2" - } - ] - } - }, - "autoScalerProfile": { - "scan-interval": "20s", - "scale-down-delay-after-add": "15m" + { + "id": "/subscriptions/subid1/resourceGroups/MC_rg1/providers/Microsoft.Network/publicIPAddresses/mgdoutboundip2" + } + ] } + }, + "autoScalerProfile": { + "scan-interval": "20s", + "scale-down-delay-after-add": "15m" } } } } } - \ No newline at end of file +} From 9135fd939b64187f81b9ddb888e9d4d3cf4e77b7 Mon Sep 17 00:00:00 2001 From: Jianping Zeng Date: Mon, 24 Jan 2022 13:20:16 -0800 Subject: [PATCH 3/3] add more details for Dedicated host group --- .../preview/2022-01-02-preview/managedClusters.json | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-01-02-preview/managedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-01-02-preview/managedClusters.json index 4fe1dbb5edbf..109b65419d08 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-01-02-preview/managedClusters.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-01-02-preview/managedClusters.json @@ -2831,8 +2831,9 @@ "description": "AKS will associate the specified agent pool with the Capacity Reservation Group." }, "hostGroupID": { - "$ref": "#/definitions/HostGroupID", - "description": "The ID for Dedicated Host Group." + "type": "string", + "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)." } }, "description": "Properties for the container service agent pool profile." @@ -4739,10 +4740,6 @@ "type": "string", "description": "The ID for Proximity Placement Group." }, - "HostGroupID": { - "type": "string", - "description": "The ID for Dedicated Host Group." - }, "CredentialResults": { "properties": { "kubeconfigs": {