Skip to content

Commit eccdca4

Browse files
FumingZhangShiqianTaorsamigullinAce Eldeibmattstam
authored
Review request for Microsoft.ContainerService to add version 2022-08-02-preview (#20487)
* Adds base for updating Microsoft.ContainerService from version preview/2022-07-02-preview to version 2022-08-02-preview * Updates readme * Updates API version in new specs and examples * sync changes from PR#19592 & PR#20145 (#20402) * update readme & remove fleets (#20388) * AKS agent pool properties add AgentPoolWindowsProfile and DisableOutboundNAT (#20407) * AKS agent pool properties add AgentPoolWindowsProfile and DisableOutboundNAT * Change disableOutboundNAT to disableOutboundNat because of ARM format; Improve description. * Improve description * Added guardrails profile to specs (#20171) * added guardrails profile to specs * linter fix * added x-ms-enum * added guardrails definitions for versions route * linter fix, added custom word * fix * typo fix * fix for example * added object type * added object type * removed data field * changed descriptions * * * add "Mariner" for AKS os sku (#20420) * add KubeProxyConfig to AKS NetworkProfile (#20446) * add KubeProxyConfig to AKS NetworkProfile * remove extra comma, type: integer for *Seconds * add custom words * prettier * follow camel case ARM guidance * 2nd camel case standard * feat: add rest api spec for ip-based lb (#20392) * fix LroLocationHeader (#20491) * fix ProvisioningStateValidation (#20490) * Removed guardrailsVersions route, added guardrails profice to MC properties (#20625) * removed guardrails-versions route, added guardrails profice to MC properties * removed unsued file for guardrails versions, removed unused custom word Co-authored-by: Shiqian Tao <62196586+ShiqianTao@users.noreply.github.com> Co-authored-by: rsamigullin <89222124+rsamigullin@users.noreply.github.com> Co-authored-by: Ace Eldeib <aleldeib@microsoft.com> Co-authored-by: Matt Stam <mattstam@live.com> Co-authored-by: Qi Ni <pomelonicky@gmail.com>
1 parent 2acf276 commit eccdca4

File tree

112 files changed

+21915
-15
lines changed

Some content is hidden

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

112 files changed

+21915
-15
lines changed

‎custom-words.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2724,3 +2724,6 @@ mediumrc
27242724
smallrc
27252725
Autotune
27262726
autogrid
2727+
KubeProxyConfig
2728+
IPVS
2729+
TCPFIN

‎specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-07-02-preview/managedClusters.json‎

Lines changed: 60 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1339,7 +1339,13 @@
13391339
"description": "OK"
13401340
},
13411341
"202": {
1342-
"description": "Accepted"
1342+
"description": "Accepted",
1343+
"headers": {
1344+
"Location": {
1345+
"description": "URL to query for status of the operation.",
1346+
"type": "string"
1347+
}
1348+
}
13431349
},
13441350
"default": {
13451351
"description": "Error response describing why the operation failed. If the cluster doesn't exist, 404 (Not found) is returned.",
@@ -1391,7 +1397,13 @@
13911397
"description": "OK"
13921398
},
13931399
"202": {
1394-
"description": "Accepted"
1400+
"description": "Accepted",
1401+
"headers": {
1402+
"Location": {
1403+
"description": "URL to query for status of the operation.",
1404+
"type": "string"
1405+
}
1406+
}
13951407
},
13961408
"default": {
13971409
"description": "Error response describing why the operation failed. If the cluster doesn't exist, 404 (Not found) is returned.",
@@ -1472,7 +1484,13 @@
14721484
],
14731485
"responses": {
14741486
"202": {
1475-
"description": "Accepted"
1487+
"description": "Accepted",
1488+
"headers": {
1489+
"Location": {
1490+
"description": "URL to query for status of the operation.",
1491+
"type": "string"
1492+
}
1493+
}
14761494
},
14771495
"204": {
14781496
"description": "NoContent"
@@ -1515,7 +1533,13 @@
15151533
],
15161534
"responses": {
15171535
"202": {
1518-
"description": "Accepted"
1536+
"description": "Accepted",
1537+
"headers": {
1538+
"Location": {
1539+
"description": "URL to query for status of the operation.",
1540+
"type": "string"
1541+
}
1542+
}
15191543
},
15201544
"204": {
15211545
"description": "NoContent"
@@ -1559,7 +1583,13 @@
15591583
],
15601584
"responses": {
15611585
"202": {
1562-
"description": "Accepted"
1586+
"description": "Accepted",
1587+
"headers": {
1588+
"Location": {
1589+
"description": "URL to query for status of the operation.",
1590+
"type": "string"
1591+
}
1592+
}
15631593
},
15641594
"204": {
15651595
"description": "NoContent"
@@ -1603,7 +1633,13 @@
16031633
],
16041634
"responses": {
16051635
"202": {
1606-
"description": "Accepted"
1636+
"description": "Accepted",
1637+
"headers": {
1638+
"Location": {
1639+
"description": "URL to query for status of the operation.",
1640+
"type": "string"
1641+
}
1642+
}
16071643
},
16081644
"204": {
16091645
"description": "NoContent"
@@ -2008,7 +2044,13 @@
20082044
],
20092045
"responses": {
20102046
"202": {
2011-
"description": "Accepted"
2047+
"description": "Accepted",
2048+
"headers": {
2049+
"Location": {
2050+
"description": "URL to query for status of the operation.",
2051+
"type": "string"
2052+
}
2053+
}
20122054
},
20132055
"200": {
20142056
"description": "command finished with async pattern, tracking by location header. !!! this is for autorest only, you never get 200 from this api !!!",
@@ -4946,9 +4988,11 @@
49464988
"description": "The current provisioning state of the pod identity.",
49474989
"enum": [
49484990
"Assigned",
4949-
"Updating",
4991+
"Canceled",
49504992
"Deleting",
4951-
"Failed"
4993+
"Failed",
4994+
"Succeeded",
4995+
"Updating"
49524996
],
49534997
"x-ms-enum": {
49544998
"name": "ManagedClusterPodIdentityProvisioningState",
@@ -5515,10 +5559,11 @@
55155559
"readOnly": true,
55165560
"description": "The current provisioning state.",
55175561
"enum": [
5518-
"Succeeded",
5562+
"Canceled",
55195563
"Creating",
55205564
"Deleting",
5521-
"Failed"
5565+
"Failed",
5566+
"Succeeded"
55225567
],
55235568
"x-ms-enum": {
55245569
"name": "PrivateEndpointConnectionProvisioningState",
@@ -6785,10 +6830,11 @@
67856830
"readOnly": true,
67866831
"description": "The current provisioning state of trusted access role binding.",
67876832
"enum": [
6788-
"Succeeded",
6833+
"Canceled",
6834+
"Deleting",
67896835
"Failed",
6790-
"Updating",
6791-
"Deleting"
6836+
"Succeeded",
6837+
"Updating"
67926838
],
67936839
"x-ms-enum": {
67946840
"name": "TrustedAccessRoleBindingProvisioningState",

‎specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-08-02-preview/examples/AgentPoolsAbortOperation.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"parameters": {
3+
"api-version": "2022-08-02-preview",
4+
"subscriptionId": "subid1",
5+
"resourceGroupName": "rg1",
6+
"resourceName": "clustername1",
7+
"agentPoolName": "agentpool1"
8+
},
9+
"responses": {
10+
"204": {}
11+
}
12+
}

‎specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-08-02-preview/examples/AgentPoolsAssociate_CRG.json‎

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

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

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
{
2+
"parameters": {
3+
"api-version": "2022-08-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+
"currentOrchestratorVersion": "1.17.8",
51+
"count": 3,
52+
"vmSize": "Standard_DS2_v2",
53+
"maxPods": 110,
54+
"osType": "Linux",
55+
"kubeletConfig": {
56+
"cpuManagerPolicy": "static",
57+
"cpuCfsQuota": true,
58+
"cpuCfsQuotaPeriod": "200ms",
59+
"imageGcHighThreshold": 90,
60+
"imageGcLowThreshold": 70,
61+
"topologyManagerPolicy": "best-effort",
62+
"allowedUnsafeSysctls": [
63+
"kernel.msg*",
64+
"net.core.somaxconn"
65+
],
66+
"failSwapOn": false
67+
},
68+
"linuxOSConfig": {
69+
"sysctls": {
70+
"netCoreWmemDefault": 12345,
71+
"netIpv4TcpTwReuse": true,
72+
"netIpv4IpLocalPortRange": "20000 60000",
73+
"kernelThreadsMax": 99999
74+
},
75+
"transparentHugePageEnabled": "always",
76+
"transparentHugePageDefrag": "madvise",
77+
"swapFileSizeMB": 1500
78+
}
79+
}
80+
}
81+
},
82+
"201": {
83+
"body": {
84+
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1",
85+
"type": "Microsoft.ContainerService/managedClusters/agentPools",
86+
"name": "agentpool1",
87+
"properties": {
88+
"provisioningState": "Creating",
89+
"orchestratorVersion": "1.17.8",
90+
"currentOrchestratorVersion": "1.17.8",
91+
"count": 3,
92+
"vmSize": "Standard_DS2_v2",
93+
"maxPods": 110,
94+
"osType": "Linux",
95+
"kubeletConfig": {
96+
"cpuManagerPolicy": "static",
97+
"cpuCfsQuota": true,
98+
"cpuCfsQuotaPeriod": "200ms",
99+
"imageGcHighThreshold": 90,
100+
"imageGcLowThreshold": 70,
101+
"topologyManagerPolicy": "best-effort",
102+
"allowedUnsafeSysctls": [
103+
"kernel.msg*",
104+
"net.core.somaxconn"
105+
],
106+
"failSwapOn": false,
107+
"podMaxPids": 100
108+
},
109+
"linuxOSConfig": {
110+
"sysctls": {
111+
"netCoreWmemDefault": 65536,
112+
"netIpv4TcpTwReuse": true,
113+
"netIpv4IpLocalPortRange": "20000 60000",
114+
"kernelThreadsMax": 99999
115+
},
116+
"transparentHugePageEnabled": "always",
117+
"transparentHugePageDefrag": "madvise",
118+
"swapFileSizeMB": 1500
119+
}
120+
}
121+
}
122+
}
123+
}
124+
}

0 commit comments

Comments
 (0)