Skip to content

Commit 392f574

Browse files
AbelHuAbelHu
authored
Add licenseType in WindowsProfile for AKS (#10050)
1 parent b950d3b commit 392f574

File tree

6 files changed

+345
-0
lines changed

6 files changed

+345
-0
lines changed

‎specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-07-01/examples/ManagedClustersCreate_UpdateWithAHUB.json‎

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

‎specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-07-01/managedClusters.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -473,6 +473,9 @@
473473
},
474474
"Create Managed Cluster with PPG": {
475475
"$ref": "./examples/ManagedClustersCreate_PPG.json"
476+
},
477+
"Create/Update Managed Cluster with EnableAHUB": {
478+
"$ref": "./examples/ManagedClustersCreate_UpdateWithAHUB.json"
476479
}
477480
}
478481
},
@@ -1849,6 +1852,18 @@
18491852
"type": "string",
18501853
"description": "The administrator password to use for Windows VMs.",
18511854
"pattern": "^(?=.*[a-z])(?=.*[A-Z])(?=.*[!@#$%\\^&\\*\\(\\)])[a-zA-Z\\d!@#$%\\^&\\*\\(\\)]{12,123}$"
1855+
},
1856+
"licenseType": {
1857+
"type": "string",
1858+
"enum": [
1859+
"None",
1860+
"Windows_Server"
1861+
],
1862+
"x-ms-enum": {
1863+
"name": "licenseType",
1864+
"modelAsString": true
1865+
},
1866+
"description": "The licenseType to use for Windows VMs. Windows_Server is used to enable Azure Hybrid User Benefits for Windows VMs."
18521867
}
18531868
},
18541869
"required": [

‎specification/containerservice/resource-manager/readme.go.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ go:
1212
1313
``` yaml $(go) && $(multiapi)
1414
batch:
15+
- tag: package-2020-07
1516
- tag: package-2020-06
1617
- tag: package-2020-04
1718
- tag: package-2020-03
@@ -32,6 +33,16 @@ batch:
3233
- tag: package-2017-08
3334
- tag: package-2017-07
3435
```
36+
### Tag: package-2020-07 and go
37+
38+
These settings apply only when `--package-2020-07 --go` is specified on the command line.
39+
Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
40+
41+
``` yaml $(tag)=='package-2020-07' && $(go)
42+
namespace: containerservice
43+
output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2020-07-01/$(namespace)
44+
```
45+
3546
### Tag: package-2020-06 and go
3647

3748
These settings apply only when `--package-2020-06 --go` is specified on the command line.

‎specification/containerservice/resource-manager/readme.java.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,20 @@ batch:
2525
- tag: package-2020-03
2626
- tag: package-2020-04
2727
- tag: package-2020-06
28+
- tag: package-2020-07
29+
```
30+
31+
### Tag: package-2020-07 and java
32+
33+
These settings apply only when `--tag=package-2020-07` is specified on the command line.
34+
Please also specify `--azure-libraries-for-java-folder=<path to the root directory of your azure-sdk-for-java clone>`.
35+
36+
``` yaml $(tag) == 'package-2020-07' && $(java) && $(multiapi)
37+
java:
38+
namespace: com.microsoft.azure.management.containerservice.v2020_07_01
39+
output-folder: $(azure-libraries-for-java-folder)/sdk/containerservice/mgmt-v2020_07_01
40+
regenerate-manager: true
41+
generate-interface: true
2842
```
2943

3044
### Tag: package-2020-06 and java

‎specification/containerservice/resource-manager/readme.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ These settings apply only when `--tag=package-2020-07` is specified on the comma
4444

4545
```yaml $(tag) == 'package-2020-07'
4646
input-file:
47+
- Microsoft.ContainerService/stable/2019-04-30/openShiftManagedClusters.json
48+
- Microsoft.ContainerService/stable/2017-07-01/containerService.json
49+
- Microsoft.ContainerService/stable/2019-08-01/location.json
4750
- Microsoft.ContainerService/stable/2020-07-01/managedClusters.json
4851
```
4952
### Tag: package-2020-06
@@ -267,6 +270,19 @@ input-file:
267270
- Microsoft.ContainerService/stable/2017-07-01/containerService.json
268271
```
269272

273+
### Tag: package-2020-07-01-only
274+
275+
These settings apply only when `--tag=package-2020-07-01-only` is specified on the command line.
276+
277+
``` yaml $(tag) == 'package-2020-07-01-only'
278+
input-file:
279+
- Microsoft.ContainerService/stable/2020-07-01/managedClusters.json
280+
directive:
281+
- suppress: DefinitionsPropertiesNamesCamelCase
282+
where: $.definitions.ManagedClusterProperties.properties.autoScalerProfile
283+
reason: Cluster-autoscaler settings are not camel-cased
284+
```
285+
270286
### Tag: package-2020-06-01-only
271287

272288
These settings apply only when `--tag=package-2020-06-01-only` is specified on the command line.
@@ -569,6 +585,7 @@ input-file:
569585
- $(this-folder)/Microsoft.ContainerService/stable/2019-04-30/openShiftManagedClusters.json
570586
- $(this-folder)/Microsoft.ContainerService/stable/2017-07-01/containerService.json
571587
- $(this-folder)/Microsoft.ContainerService/stable/2019-08-01/location.json
588+
- $(this-folder)/Microsoft.ContainerService/stable/2020-07-01/managedClusters.json
572589
- $(this-folder)/Microsoft.ContainerService/stable/2020-06-01/managedClusters.json
573590
- $(this-folder)/Microsoft.ContainerService/stable/2020-04-01/managedClusters.json
574591
- $(this-folder)/Microsoft.ContainerService/stable/2020-03-01/managedClusters.json

0 commit comments

Comments
 (0)