Skip to content

Commit 4fe5f51

Browse files
zjpjackzjpjack
authored
GA AKS support for Dedicated Host Group (#19547)
* GA AKS support for Dedicated Host Group * fit some format minor issue * add newline in end of files
1 parent 5c4c3ae commit 4fe5f51

File tree

3 files changed

+322
-0
lines changed

3 files changed

+322
-0
lines changed

‎specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2022-06-01/examples/AgentPoolsCreate_DedicatedHostGroup.json

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
{
2+
"parameters": {
3+
"api-version": "2022-01-02-preview",
4+
"subscriptionId": "subid1",
5+
"resourceGroupName": "rg1",
6+
"resourceName": "clustername1",
7+
"agentPoolName": "agentpool1",
8+
"parameters": {
9+
"properties": {
10+
"orchestratorVersion": "",
11+
"count": 3,
12+
"vmSize": "Standard_DS2_v2",
13+
"osType": "Linux",
14+
"hostGroupID": "/subscriptions/subid1/resourcegroups/rg/providers/Microsoft.Compute/hostGroups/hostgroup1"
15+
}
16+
}
17+
},
18+
"responses": {
19+
"200": {
20+
"body": {
21+
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1",
22+
"type": "Microsoft.ContainerService/managedClusters/agentPools",
23+
"name": "agentpool1",
24+
"properties": {
25+
"provisioningState": "Succeeded",
26+
"orchestratorVersion": "1.19.6",
27+
"count": 3,
28+
"vmSize": "Standard_DS2_v2",
29+
"maxPods": 110,
30+
"osType": "Linux",
31+
"hostGroupID": "/subscriptions/subid1/resourcegroups/rg/providers/Microsoft.Compute/hostGroups/hostgroup1"
32+
}
33+
}
34+
},
35+
"201": {
36+
"body": {
37+
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1",
38+
"type": "Microsoft.ContainerService/managedClusters/agentPools",
39+
"name": "agentpool1",
40+
"properties": {
41+
"provisioningState": "Creating",
42+
"orchestratorVersion": "1.19.6",
43+
"count": 3,
44+
"vmSize": "Standard_DS2_v2",
45+
"maxPods": 110,
46+
"osType": "Linux",
47+
"hostGroupID": "/subscriptions/subid1/resourcegroups/rg/providers/Microsoft.Compute/hostGroups/hostgroup1"
48+
}
49+
}
50+
}
51+
}
52+
}

‎specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2022-06-01/examples/ManagedClustersCreate_DedicatedHostGroup.json

Lines changed: 251 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,251 @@
1+
{
2+
"parameters": {
3+
"api-version": "2022-01-02-preview",
4+
"subscriptionId": "subid1",
5+
"resourceGroupName": "rg1",
6+
"resourceName": "clustername1",
7+
"parameters": {
8+
"location": "location1",
9+
"tags": {
10+
"tier": "production",
11+
"archv2": ""
12+
},
13+
"sku": {
14+
"name": "Basic",
15+
"tier": "Free"
16+
},
17+
"properties": {
18+
"kubernetesVersion": "",
19+
"dnsPrefix": "dnsprefix1",
20+
"agentPoolProfiles": [
21+
{
22+
"name": "nodepool1",
23+
"count": 3,
24+
"vmSize": "Standard_DS2_v2",
25+
"osType": "Linux",
26+
"type": "VirtualMachineScaleSets",
27+
"enableNodePublicIP": true,
28+
"hostGroupID": "/subscriptions/subid1/resourcegroups/rg/providers/Microsoft.Compute/hostGroups/hostgroup1"
29+
}
30+
],
31+
"linuxProfile": {
32+
"adminUsername": "azureuser",
33+
"ssh": {
34+
"publicKeys": [
35+
{
36+
"keyData": "keydata"
37+
}
38+
]
39+
}
40+
},
41+
"networkProfile": {
42+
"loadBalancerSku": "standard",
43+
"outboundType": "loadBalancer",
44+
"loadBalancerProfile": {
45+
"managedOutboundIPs": {
46+
"count": 2
47+
}
48+
}
49+
},
50+
"autoScalerProfile": {
51+
"scan-interval": "20s",
52+
"scale-down-delay-after-add": "15m"
53+
},
54+
"windowsProfile": {
55+
"adminUsername": "azureuser",
56+
"adminPassword": "replacePassword1234$"
57+
},
58+
"servicePrincipalProfile": {
59+
"clientId": "clientid",
60+
"secret": "secret"
61+
},
62+
"addonProfiles": {},
63+
"enableRBAC": true,
64+
"diskEncryptionSetID": "/subscriptions/subid1/resourceGroups/rg1/providers/Microsoft.Compute/diskEncryptionSets/des",
65+
"enablePodSecurityPolicy": false
66+
}
67+
}
68+
},
69+
"responses": {
70+
"200": {
71+
"body": {
72+
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1",
73+
"location": "location1",
74+
"name": "clustername1",
75+
"tags": {
76+
"archv2": "",
77+
"tier": "production"
78+
},
79+
"type": "Microsoft.ContainerService/ManagedClusters",
80+
"properties": {
81+
"provisioningState": "Succeeded",
82+
"maxAgentPools": 1,
83+
"kubernetesVersion": "1.9.6",
84+
"dnsPrefix": "dnsprefix1",
85+
"agentPoolProfiles": [
86+
{
87+
"name": "nodepool1",
88+
"count": 3,
89+
"vmSize": "Standard_DS2_v2",
90+
"maxPods": 110,
91+
"osType": "Linux",
92+
"provisioningState": "Succeeded",
93+
"orchestratorVersion": "1.9.6",
94+
"type": "VirtualMachineScaleSets",
95+
"enableNodePublicIP": true,
96+
"nodeImageVersion": "AKSUbuntu:1604:2020.03.11",
97+
"hostGroupID": "/subscriptions/subid1/resourcegroups/rg/providers/Microsoft.Compute/hostGroups/hostgroup1"
98+
}
99+
],
100+
"linuxProfile": {
101+
"adminUsername": "azureuser",
102+
"ssh": {
103+
"publicKeys": [
104+
{
105+
"keyData": "keydata"
106+
}
107+
]
108+
}
109+
},
110+
"windowsProfile": {
111+
"adminUsername": "azureuser"
112+
},
113+
"servicePrincipalProfile": {
114+
"clientId": "clientid"
115+
},
116+
"nodeResourceGroup": "MC_rg1_clustername1_location1",
117+
"enableRBAC": true,
118+
"diskEncryptionSetID": "/subscriptions/subid1/resourceGroups/rg1/providers/Microsoft.Compute/diskEncryptionSets/des",
119+
"enablePodSecurityPolicy": false,
120+
"fqdn": "dnsprefix1-abcd1234.hcp.eastus.azmk8s.io",
121+
"networkProfile": {
122+
"loadBalancerSku": "basic",
123+
"networkPlugin": "kubenet",
124+
"podCidr": "10.244.0.0/16",
125+
"serviceCidr": "10.0.0.0/16",
126+
"dnsServiceIP": "10.0.0.10",
127+
"dockerBridgeCidr": "172.17.0.1/16",
128+
"outboundType": "loadBalancer",
129+
"podCidrs": [
130+
"10.244.0.0/16"
131+
],
132+
"serviceCidrs": [
133+
"10.0.0.0/16"
134+
],
135+
"ipFamilies": [
136+
"IPv4"
137+
],
138+
"loadBalancerProfile": {
139+
"allocatedOutboundPorts": 2000,
140+
"idleTimeoutInMinutes": 10,
141+
"managedOutboundIPs": {
142+
"count": 2
143+
},
144+
"effectiveOutboundIPs": [
145+
{
146+
"id": "/subscriptions/subid1/resourceGroups/MC_rg1/providers/Microsoft.Network/publicIPAddresses/mgdoutboundip1"
147+
},
148+
{
149+
"id": "/subscriptions/subid1/resourceGroups/MC_rg1/providers/Microsoft.Network/publicIPAddresses/mgdoutboundip2"
150+
}
151+
]
152+
}
153+
},
154+
"autoScalerProfile": {
155+
"scan-interval": "20s",
156+
"scale-down-delay-after-add": "15m"
157+
}
158+
}
159+
}
160+
},
161+
"201": {
162+
"body": {
163+
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1",
164+
"location": "location1",
165+
"name": "clustername1",
166+
"tags": {
167+
"archv2": "",
168+
"tier": "production"
169+
},
170+
"type": "Microsoft.ContainerService/ManagedClusters",
171+
"properties": {
172+
"provisioningState": "Creating",
173+
"maxAgentPools": 1,
174+
"kubernetesVersion": "1.9.6",
175+
"dnsPrefix": "dnsprefix1",
176+
"agentPoolProfiles": [
177+
{
178+
"name": "nodepool1",
179+
"count": 3,
180+
"vmSize": "Standard_DS2_v2",
181+
"maxPods": 110,
182+
"osType": "Linux",
183+
"provisioningState": "Creating",
184+
"orchestratorVersion": "1.9.6",
185+
"type": "VirtualMachineScaleSets",
186+
"enableNodePublicIP": true,
187+
"hostGroupID": "/subscriptions/subid1/resourcegroups/rg/providers/Microsoft.Compute/hostGroups/hostgroup1"
188+
}
189+
],
190+
"linuxProfile": {
191+
"adminUsername": "azureuser",
192+
"ssh": {
193+
"publicKeys": [
194+
{
195+
"keyData": "keydata"
196+
}
197+
]
198+
}
199+
},
200+
"windowsProfile": {
201+
"adminUsername": "azureuser"
202+
},
203+
"servicePrincipalProfile": {
204+
"clientId": "clientid"
205+
},
206+
"nodeResourceGroup": "MC_rg1_clustername1_location1",
207+
"enableRBAC": true,
208+
"diskEncryptionSetID": "/subscriptions/subid1/resourceGroups/rg1/providers/Microsoft.Compute/diskEncryptionSets/des",
209+
"enablePodSecurityPolicy": false,
210+
"networkProfile": {
211+
"networkPlugin": "kubenet",
212+
"podCidr": "10.244.0.0/16",
213+
"serviceCidr": "10.0.0.0/16",
214+
"dnsServiceIP": "10.0.0.10",
215+
"dockerBridgeCidr": "172.17.0.1/16",
216+
"loadBalancerSku": "standard",
217+
"outboundType": "loadBalancer",
218+
"podCidrs": [
219+
"10.244.0.0/16"
220+
],
221+
"serviceCidrs": [
222+
"10.0.0.0/16"
223+
],
224+
"ipFamilies": [
225+
"IPv4"
226+
],
227+
"loadBalancerProfile": {
228+
"allocatedOutboundPorts": 2000,
229+
"idleTimeoutInMinutes": 10,
230+
"managedOutboundIPs": {
231+
"count": 2
232+
},
233+
"effectiveOutboundIPs": [
234+
{
235+
"id": "/subscriptions/subid1/resourceGroups/MC_rg1/providers/Microsoft.Network/publicIPAddresses/mgdoutboundip1"
236+
},
237+
{
238+
"id": "/subscriptions/subid1/resourceGroups/MC_rg1/providers/Microsoft.Network/publicIPAddresses/mgdoutboundip2"
239+
}
240+
]
241+
}
242+
},
243+
"autoScalerProfile": {
244+
"scan-interval": "20s",
245+
"scale-down-delay-after-add": "15m"
246+
}
247+
}
248+
}
249+
}
250+
}
251+
}

‎specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2022-06-01/managedClusters.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -578,6 +578,9 @@
578578
},
579579
"Create/Update Managed Cluster with dual-stack networking": {
580580
"$ref": "./examples/ManagedClustersCreate_DualStackNetworking.json"
581+
},
582+
"Create Managed Cluster with Dedicated Host Group": {
583+
"$ref": "./examples/ManagedClustersCreate_DedicatedHostGroup.json"
581584
}
582585
}
583586
},
@@ -1067,6 +1070,9 @@
10671070
},
10681071
"Start Agent Pool": {
10691072
"$ref": "./examples/AgentPools_Start.json"
1073+
},
1074+
"Create Agent Pool with Dedicated Host Group": {
1075+
"$ref": "./examples/AgentPoolsCreate_DedicatedHostGroup.json"
10701076
}
10711077
}
10721078
},
@@ -2781,6 +2787,19 @@
27812787
"creationData": {
27822788
"$ref": "#/definitions/CreationData",
27832789
"description": "CreationData to be used to specify the source Snapshot ID if the node pool will be created/upgraded using a snapshot."
2790+
},
2791+
"hostGroupID": {
2792+
"type": "string",
2793+
"format": "arm-id",
2794+
"x-ms-arm-id-details": {
2795+
"allowedResources": [
2796+
{
2797+
"type": "Microsoft.Compute/hostGroups"
2798+
}
2799+
]
2800+
},
2801+
"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.",
2802+
"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)."
27842803
}
27852804
},
27862805
"description": "Properties for the container service agent pool profile."

0 commit comments

Comments
 (0)