Skip to content

Commit f0e4622

Browse files
FumingZhangmattstamnorshteinzjpjackJianping Zeng
authored
Review request for Microsoft.ContainerService to add version 2022-01-02-preview (#17579)
* Adds base for updating Microsoft.ContainerService from version preview/2021-11-01-preview to version 2022-01-02-preview * Updates readme * Updates API version in new specs and examples * Add NetworkPlugin none option (#17393) * Update readme to help generate SDK (#17372) * update readme to help generate SDK * update readme * fix golang readme * fix tag * Add adminUsers in aadprofile (#17367) * Add adminUsers in aadprofile * Update description * Support query parameter 'format' in listClusterUserCredential handler (#17211) * Support query parameter 'format' in listClusterUserCredential handler * Fix lint * Fix typo * Add property HostGroupID and its examples (#17459) * Add property HostGroupID and its examples * fix format issue * add more details for Dedicated host group Co-authored-by: Jianping Zeng <[email protected]> * Revert "Add adminUsers in aadprofile (#17367)" (#17522) This reverts commit ba6e656. * fix conflict (#17624) Co-authored-by: Matt Stam <[email protected]> Co-authored-by: Tongyao Si <[email protected]> Co-authored-by: Jianping Zeng <[email protected]> Co-authored-by: Jianping Zeng <[email protected]>
1 parent 3fb3861 commit f0e4622

File tree

89 files changed

+18573
-2
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+18573
-2
lines changed

‎custom-words.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1061,6 +1061,7 @@ kubeconfig
10611061
kubeconfigs
10621062
kubelet
10631063
Kubelet
1064+
kubelogin
10641065
kubenet
10651066
kubernetes
10661067
Kustomization

‎specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-01-02-preview/examples/AgentPoolsAssociate_CRG.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+
"capacityReservationGroupID": "/subscriptions/subid1/resourcegroups/rg1/providers//Microsoft.Compute/CapacityReservationGroups/crg1"
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.9.6",
27+
"count": 3,
28+
"vmSize": "Standard_DS2_v2",
29+
"maxPods": 110,
30+
"osType": "Linux",
31+
"capacityReservationGroupID": "/subscriptions/subid1/resourcegroups/rg1/providers//Microsoft.Compute/CapacityReservationGroups/crg1"
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.9.6",
43+
"count": 3,
44+
"vmSize": "Standard_DS2_v2",
45+
"maxPods": 110,
46+
"osType": "Linux",
47+
"capacityReservationGroupID": "/subscriptions/subid1/resourcegroups/rg1/providers//Microsoft.Compute/CapacityReservationGroups/crg1"
48+
}
49+
}
50+
}
51+
}
52+
}

‎specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-01-02-preview/examples/AgentPoolsCreate_CustomNodeConfig.json

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
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+
"kubeletConfig": {
15+
"cpuManagerPolicy": "static",
16+
"cpuCfsQuota": true,
17+
"cpuCfsQuotaPeriod": "200ms",
18+
"imageGcHighThreshold": 90,
19+
"imageGcLowThreshold": 70,
20+
"topologyManagerPolicy": "best-effort",
21+
"allowedUnsafeSysctls": [
22+
"kernel.msg*",
23+
"net.core.somaxconn"
24+
],
25+
"failSwapOn": false
26+
},
27+
"linuxOSConfig": {
28+
"sysctls": {
29+
"netCoreWmemDefault": 12345,
30+
"netIpv4TcpTwReuse": true,
31+
"netIpv4IpLocalPortRange": "20000 60000",
32+
"kernelThreadsMax": 99999
33+
},
34+
"transparentHugePageEnabled": "always",
35+
"transparentHugePageDefrag": "madvise",
36+
"swapFileSizeMB": 1500
37+
}
38+
}
39+
}
40+
},
41+
"responses": {
42+
"200": {
43+
"body": {
44+
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1",
45+
"type": "Microsoft.ContainerService/managedClusters/agentPools",
46+
"name": "agentpool1",
47+
"properties": {
48+
"provisioningState": "Succeeded",
49+
"orchestratorVersion": "1.17.8",
50+
"count": 3,
51+
"vmSize": "Standard_DS2_v2",
52+
"maxPods": 110,
53+
"osType": "Linux",
54+
"kubeletConfig": {
55+
"cpuManagerPolicy": "static",
56+
"cpuCfsQuota": true,
57+
"cpuCfsQuotaPeriod": "200ms",
58+
"imageGcHighThreshold": 90,
59+
"imageGcLowThreshold": 70,
60+
"topologyManagerPolicy": "best-effort",
61+
"allowedUnsafeSysctls": [
62+
"kernel.msg*",
63+
"net.core.somaxconn"
64+
],
65+
"failSwapOn": false
66+
},
67+
"linuxOSConfig": {
68+
"sysctls": {
69+
"netCoreWmemDefault": 12345,
70+
"netIpv4TcpTwReuse": true,
71+
"netIpv4IpLocalPortRange": "20000 60000",
72+
"kernelThreadsMax": 99999
73+
},
74+
"transparentHugePageEnabled": "always",
75+
"transparentHugePageDefrag": "madvise",
76+
"swapFileSizeMB": 1500
77+
}
78+
}
79+
}
80+
},
81+
"201": {
82+
"body": {
83+
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1",
84+
"type": "Microsoft.ContainerService/managedClusters/agentPools",
85+
"name": "agentpool1",
86+
"properties": {
87+
"provisioningState": "Creating",
88+
"orchestratorVersion": "1.17.8",
89+
"count": 3,
90+
"vmSize": "Standard_DS2_v2",
91+
"maxPods": 110,
92+
"osType": "Linux",
93+
"kubeletConfig": {
94+
"cpuManagerPolicy": "static",
95+
"cpuCfsQuota": true,
96+
"cpuCfsQuotaPeriod": "200ms",
97+
"imageGcHighThreshold": 90,
98+
"imageGcLowThreshold": 70,
99+
"topologyManagerPolicy": "best-effort",
100+
"allowedUnsafeSysctls": [
101+
"kernel.msg*",
102+
"net.core.somaxconn"
103+
],
104+
"failSwapOn": false,
105+
"podMaxPids": 100
106+
},
107+
"linuxOSConfig": {
108+
"sysctls": {
109+
"netCoreWmemDefault": 65536,
110+
"netIpv4TcpTwReuse": true,
111+
"netIpv4IpLocalPortRange": "20000 60000",
112+
"kernelThreadsMax": 99999
113+
},
114+
"transparentHugePageEnabled": "always",
115+
"transparentHugePageDefrag": "madvise",
116+
"swapFileSizeMB": 1500
117+
}
118+
}
119+
}
120+
}
121+
}
122+
}

‎specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-01-02-preview/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/preview/2022-01-02-preview/examples/AgentPoolsCreate_EnableEncryptionAtHost.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+
"enableEncryptionAtHost": true
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.17.13",
27+
"count": 3,
28+
"vmSize": "Standard_DS2_v2",
29+
"maxPods": 110,
30+
"osType": "Linux",
31+
"enableEncryptionAtHost": true
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.17.13",
43+
"count": 3,
44+
"vmSize": "Standard_DS2_v2",
45+
"maxPods": 110,
46+
"osType": "Linux",
47+
"enableEncryptionAtHost": true
48+
}
49+
}
50+
}
51+
}
52+
}

‎specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-01-02-preview/examples/AgentPoolsCreate_EnableFIPS.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+
"enableFIPS": true
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+
"enableFIPS": true
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+
"enableFIPS": true
48+
}
49+
}
50+
}
51+
}
52+
}

‎specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-01-02-preview/examples/AgentPoolsCreate_EnableUltraSSD.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+
"enableUltraSSD": true
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.17.13",
27+
"count": 3,
28+
"vmSize": "Standard_DS2_v2",
29+
"maxPods": 110,
30+
"osType": "Linux",
31+
"enableUltraSSD": true
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.17.13",
43+
"count": 3,
44+
"vmSize": "Standard_DS2_v2",
45+
"maxPods": 110,
46+
"osType": "Linux",
47+
"enableUltraSSD": true
48+
}
49+
}
50+
}
51+
}
52+
}

0 commit comments

Comments
 (0)