Skip to content

Commit f528ab6

Browse files
kaiqzhanFumingZhangmatthchrbchoorparnes
authored
[AKS] Merge dev-containerservice-Microsoft.ContainerService-2021-07-01 to master (#15370)
* Adds base for updating Microsoft.ContainerService from version stable/2021-05-01 to version 2021-07-01 * Updates readme * Updates API version in new specs and examples * Modify Swagger to fix the problem of automatically generating ugly names in track 2 (#14758) * update swagger to fix track 2 autogenerated naming issue * fix * update readme for sdk generation * fix lint error * Trigger Build * update readme * Improve AKS Swagger documentation (#14957) * Improve AKS Swagger documentation - This change has already been merged in master for the 2021-05-01 API version. * Fix up custom words * aks: replace CloudError with ManagedClusterPodIdentityProvisioningError for AAD pod identity provisioning spec (#15033) * fix: decouple pod identity provisioning error from cloud error * drop extra external mark * fix linting issue * fix reference * Dev containerservice microsoft.container service 2021 07 01: add SecurityProfile (#15035) * Add SecurityProfile to ManagedClusters * spaces * Space * spaces * json formatting * move from params to defs * :) * just another * now with npm * Descriptions update for AKS July API (#15074) * allow disabling of runcommand (#15092) * allow disabling of runcommand * format error * format with example * change enable to disable * Revert "allow disabling of runcommand (#15092)" (#15147) This reverts commit ec3e241. * [AKS] Add NATGatewayProfile to 2021-07-01 API (#15154) * [AKS] Add NATGatewayProfile to 2021-07-01 API * Fix linter errors Co-authored-by: Kaiqi Zhang <kaiqzhan@microsoft.com> * Add scaleDownMode to agent pool properties (#15124) * add scale down mode * address comments * fix markdown link * update proper api version * Resolve python markdown conflict & fix typo (#15402) * resolve python conflict & fix typo * resolve conflict Co-authored-by: FumingZhang <81607949+FumingZhang@users.noreply.github.com> Co-authored-by: Matthew Christopher <matthchr@microsoft.com> Co-authored-by: hbc <bcxxxxxx@gmail.com> Co-authored-by: Or Parnes <orparnes@gmail.com> Co-authored-by: Haitao Chen <haitch@users.noreply.github.com> Co-authored-by: Kaiqi Zhang <kaiqzhan@microsoft.com> Co-authored-by: Marwan Ahmed <marwanad@microsoft.com> Co-authored-by: Arthur Ning <57385816+akning-ms@users.noreply.github.com>
1 parent 7a2f167 commit f528ab6

File tree

67 files changed

+11518
-3
lines changed

Some content is hidden

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

67 files changed

+11518
-3
lines changed

‎specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2021-07-01/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": "2021-07-01",
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/stable/2021-07-01/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": "2021-07-01",
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/stable/2021-07-01/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": "2021-07-01",
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/stable/2021-07-01/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": "2021-07-01",
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+
}

‎specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2021-07-01/examples/AgentPoolsCreate_Ephemeral.json‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
{
2+
"parameters": {
3+
"api-version": "2021-07-01",
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+
"osDiskType": "Ephemeral",
15+
"osDiskSizeGB": 64
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.17.8",
28+
"count": 3,
29+
"vmSize": "Standard_DS2_v2",
30+
"maxPods": 110,
31+
"osType": "Linux",
32+
"osDiskType": "Ephemeral",
33+
"osDiskSizeGB": 64
34+
}
35+
}
36+
},
37+
"201": {
38+
"body": {
39+
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1",
40+
"type": "Microsoft.ContainerService/managedClusters/agentPools",
41+
"name": "agentpool1",
42+
"properties": {
43+
"provisioningState": "Creating",
44+
"orchestratorVersion": "1.17.8",
45+
"count": 3,
46+
"vmSize": "Standard_DS2_v2",
47+
"maxPods": 110,
48+
"osType": "Linux",
49+
"osDiskType": "Ephemeral",
50+
"kubeletDiskType": "OS",
51+
"osDiskSizeGB": 64
52+
}
53+
}
54+
}
55+
}
56+
}

0 commit comments

Comments
 (0)