Skip to content

Commit c4b1662

Browse files
zqingqing1zqingqing1
authored
add VirtualMachines agent pool type (#26034)
1 parent 2591327 commit c4b1662

File tree

3 files changed

+298
-1
lines changed

3 files changed

+298
-1
lines changed

‎specification/containerservice/resource-manager/Microsoft.ContainerService/aks/preview/2023-09-02-preview/examples/AgentPoolsCreate_VirtualMachines.json‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
{
2+
"parameters": {
3+
"api-version": "2023-09-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+
"enableFIPS": true,
15+
"type": "VirtualMachines"
16+
}
17+
}
18+
},
19+
"responses": {
20+
"200": {
21+
"body": {
22+
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1",
23+
"type": "Microsoft.ContainerService/managedClusters/agentPools",
24+
"name": "agentpool1",
25+
"properties": {
26+
"provisioningState": "Succeeded",
27+
"orchestratorVersion": "1.19.6",
28+
"currentOrchestratorVersion": "1.19.6",
29+
"count": 3,
30+
"vmSize": "Standard_DS2_v2",
31+
"maxPods": 110,
32+
"osType": "Linux",
33+
"enableFIPS": true,
34+
"type": "VirtualMachines"
35+
}
36+
}
37+
},
38+
"201": {
39+
"body": {
40+
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1",
41+
"type": "Microsoft.ContainerService/managedClusters/agentPools",
42+
"name": "agentpool1",
43+
"properties": {
44+
"provisioningState": "Creating",
45+
"orchestratorVersion": "1.19.6",
46+
"currentOrchestratorVersion": "1.19.6",
47+
"count": 3,
48+
"vmSize": "Standard_DS2_v2",
49+
"maxPods": 110,
50+
"osType": "Linux",
51+
"enableFIPS": true,
52+
"type": "VirtualMachines"
53+
}
54+
}
55+
}
56+
}
57+
}

‎specification/containerservice/resource-manager/Microsoft.ContainerService/aks/preview/2023-09-02-preview/examples/ManagedClustersCreate_VirtualMachines.json‎

Lines changed: 229 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,229 @@
1+
{
2+
"parameters": {
3+
"api-version": "2023-09-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": "VirtualMachines",
27+
"mode": "System",
28+
"enableFIPS": true
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+
"servicePrincipalProfile": {
51+
"clientId": "clientid",
52+
"secret": "secret"
53+
},
54+
"addonProfiles": {},
55+
"enableRBAC": true,
56+
"diskEncryptionSetID": "/subscriptions/subid1/resourceGroups/rg1/providers/Microsoft.Compute/diskEncryptionSets/des",
57+
"enablePodSecurityPolicy": false
58+
}
59+
}
60+
},
61+
"responses": {
62+
"200": {
63+
"body": {
64+
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1",
65+
"location": "location1",
66+
"name": "clustername1",
67+
"tags": {
68+
"archv2": "",
69+
"tier": "production"
70+
},
71+
"type": "Microsoft.ContainerService/ManagedClusters",
72+
"properties": {
73+
"provisioningState": "Succeeded",
74+
"maxAgentPools": 1,
75+
"kubernetesVersion": "1.9.6",
76+
"dnsPrefix": "dnsprefix1",
77+
"agentPoolProfiles": [
78+
{
79+
"name": "nodepool1",
80+
"count": 3,
81+
"vmSize": "Standard_DS2_v2",
82+
"maxPods": 110,
83+
"osType": "Linux",
84+
"provisioningState": "Succeeded",
85+
"orchestratorVersion": "1.9.6",
86+
"currentOrchestratorVersion": "1.9.6",
87+
"type": "VirtualMachines",
88+
"mode": "System",
89+
"nodeImageVersion": "AKSUbuntu:1604:2020.03.11",
90+
"enableFIPS": true
91+
}
92+
],
93+
"linuxProfile": {
94+
"adminUsername": "azureuser",
95+
"ssh": {
96+
"publicKeys": [
97+
{
98+
"keyData": "keydata"
99+
}
100+
]
101+
}
102+
},
103+
"servicePrincipalProfile": {
104+
"clientId": "clientid"
105+
},
106+
"nodeResourceGroup": "MC_rg1_clustername1_location1",
107+
"enableRBAC": true,
108+
"diskEncryptionSetID": "/subscriptions/subid1/resourceGroups/rg1/providers/Microsoft.Compute/diskEncryptionSets/des",
109+
"enablePodSecurityPolicy": false,
110+
"fqdn": "dnsprefix1-abcd1234.hcp.eastus.azmk8s.io",
111+
"networkProfile": {
112+
"loadBalancerSku": "basic",
113+
"networkPlugin": "kubenet",
114+
"podCidr": "10.244.0.0/16",
115+
"serviceCidr": "10.0.0.0/16",
116+
"dnsServiceIP": "10.0.0.10",
117+
"outboundType": "loadBalancer",
118+
"podCidrs": [
119+
"10.244.0.0/16"
120+
],
121+
"serviceCidrs": [
122+
"10.0.0.0/16"
123+
],
124+
"ipFamilies": [
125+
"IPv4"
126+
],
127+
"loadBalancerProfile": {
128+
"allocatedOutboundPorts": 2000,
129+
"idleTimeoutInMinutes": 10,
130+
"managedOutboundIPs": {
131+
"count": 2
132+
},
133+
"effectiveOutboundIPs": [
134+
{
135+
"id": "/subscriptions/subid1/resourceGroups/MC_rg1/providers/Microsoft.Network/publicIPAddresses/mgdoutboundip1"
136+
},
137+
{
138+
"id": "/subscriptions/subid1/resourceGroups/MC_rg1/providers/Microsoft.Network/publicIPAddresses/mgdoutboundip2"
139+
}
140+
]
141+
}
142+
}
143+
}
144+
}
145+
},
146+
"201": {
147+
"body": {
148+
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1",
149+
"location": "location1",
150+
"name": "clustername1",
151+
"tags": {
152+
"archv2": "",
153+
"tier": "production"
154+
},
155+
"type": "Microsoft.ContainerService/ManagedClusters",
156+
"properties": {
157+
"provisioningState": "Creating",
158+
"maxAgentPools": 1,
159+
"kubernetesVersion": "1.9.6",
160+
"dnsPrefix": "dnsprefix1",
161+
"agentPoolProfiles": [
162+
{
163+
"name": "nodepool1",
164+
"count": 3,
165+
"vmSize": "Standard_DS2_v2",
166+
"maxPods": 110,
167+
"osType": "Linux",
168+
"provisioningState": "Creating",
169+
"orchestratorVersion": "1.9.6",
170+
"currentOrchestratorVersion": "1.9.6",
171+
"type": "VirtualMachines",
172+
"mode": "System",
173+
"enableFIPS": true
174+
}
175+
],
176+
"linuxProfile": {
177+
"adminUsername": "azureuser",
178+
"ssh": {
179+
"publicKeys": [
180+
{
181+
"keyData": "keydata"
182+
}
183+
]
184+
}
185+
},
186+
"servicePrincipalProfile": {
187+
"clientId": "clientid"
188+
},
189+
"nodeResourceGroup": "MC_rg1_clustername1_location1",
190+
"enableRBAC": true,
191+
"diskEncryptionSetID": "/subscriptions/subid1/resourceGroups/rg1/providers/Microsoft.Compute/diskEncryptionSets/des",
192+
"enablePodSecurityPolicy": false,
193+
"networkProfile": {
194+
"networkPlugin": "kubenet",
195+
"podCidr": "10.244.0.0/16",
196+
"serviceCidr": "10.0.0.0/16",
197+
"dnsServiceIP": "10.0.0.10",
198+
"loadBalancerSku": "standard",
199+
"outboundType": "loadBalancer",
200+
"podCidrs": [
201+
"10.244.0.0/16"
202+
],
203+
"serviceCidrs": [
204+
"10.0.0.0/16"
205+
],
206+
"ipFamilies": [
207+
"IPv4"
208+
],
209+
"loadBalancerProfile": {
210+
"allocatedOutboundPorts": 2000,
211+
"idleTimeoutInMinutes": 10,
212+
"managedOutboundIPs": {
213+
"count": 2
214+
},
215+
"effectiveOutboundIPs": [
216+
{
217+
"id": "/subscriptions/subid1/resourceGroups/MC_rg1/providers/Microsoft.Network/publicIPAddresses/mgdoutboundip1"
218+
},
219+
{
220+
"id": "/subscriptions/subid1/resourceGroups/MC_rg1/providers/Microsoft.Network/publicIPAddresses/mgdoutboundip2"
221+
}
222+
]
223+
}
224+
}
225+
}
226+
}
227+
}
228+
}
229+
}

‎specification/containerservice/resource-manager/Microsoft.ContainerService/aks/preview/2023-09-02-preview/managedClusters.json‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -645,6 +645,9 @@
645645
},
646646
"Create Managed Cluster with CustomCATrustCertificates populated and CustomCATrust enabled": {
647647
"$ref": "./examples/ManagedClustersCreate_EnableCustomCATrust.json"
648+
},
649+
"Create Managed Cluster with VirtualMachines pool type": {
650+
"$ref": "./examples/ManagedClustersCreate_VirtualMachines.json"
648651
}
649652
}
650653
},
@@ -1231,6 +1234,9 @@
12311234
},
12321235
"Create Agent Pool with CustomCATrust enabled": {
12331236
"$ref": "./examples/AgentPoolsCreate_EnableCustomCATrust.json"
1237+
},
1238+
"Create Agent Pool with VirtualMachines pool type": {
1239+
"$ref": "./examples/AgentPoolsCreate_VirtualMachines.json"
12341240
}
12351241
}
12361242
},
@@ -3930,7 +3936,8 @@
39303936
"type": "string",
39313937
"enum": [
39323938
"VirtualMachineScaleSets",
3933-
"AvailabilitySet"
3939+
"AvailabilitySet",
3940+
"VirtualMachines"
39343941
],
39353942
"x-ms-enum": {
39363943
"name": "AgentPoolType",
@@ -3943,6 +3950,10 @@
39433950
{
39443951
"value": "AvailabilitySet",
39453952
"description": "Use of this is strongly discouraged."
3953+
},
3954+
{
3955+
"value": "VirtualMachines",
3956+
"description": "Create an Agent Pool backed by a Single Instance VM orchestration mode."
39463957
}
39473958
]
39483959
},

0 commit comments

Comments
 (0)