Skip to content

Commit 95eada8

Browse files
moreOver0tyler-lloydgossionkarataliuShiqianTao
authored and
FredericHeem
committed
Review request for Microsoft.ContainerService to add version 2022-04-02-preview (Azure#18900)
* Adds base for updating Microsoft.ContainerService from version preview/2022-03-02-preview to version 2022-04-02-preview * Updates readme * Updates API version in new specs and examples * update readme (Azure#18714) * add NetworkPluginMode to ManagedCluster (Azure#18735) * add NetworkPluginMode to ManagedCluster * add overlay example * remove example * only keep overlap as option * Add properties for apiserver-vnet-integration (Azure#18705) * Update for AKS trusted access feature (Azure#18708) * Update for AKS trusted access feature * fixup! Update for AKS trusted access feature * fixup! fixup! Update for AKS trusted access feature * fixup! fixup! fixup! Update for AKS trusted access feature * fixup! fixup! fixup! fixup! Update for AKS trusted access feature * fixup! fixup! fixup! fixup! fixup! Update for AKS trusted access feature * fixup! fixup! fixup! fixup! fixup! fixup! Update for AKS trusted access feature * fixup! fixup! fixup! fixup! fixup! fixup! fixup! Update for AKS trusted access feature * fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! Update for AKS trusted access feature * fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! Update for AKS trusted access feature * fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! Update for AKS trusted access feature * fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! Update for AKS trusted access feature * OSSKU supports Windows options (Azure#18706) * OSSKU supports Windows options * Add example Create Agent Pool with Windows OSSKU * Improve description about the default value * Improve the description to clarify * Improve description about default Windows OSSKU * add storageProfile into managedcluster (Azure#18817) Signed-off-by: Ji An Liu <[email protected]> * capatalize NetworkPluginMode name (Azure#18884) * capatalize NetworkPluginMode name * capitalize in description * aks: add enableCustomCATrust in v20220402-preview api-version (Azure#18830) * aks: add enableCustomCATrust in v20220402-preview api-version * aks: add description of CustomCATrust * aks: fix typo, add DaemonSet to custom words list Co-authored-by: Mikolaj Umanski <[email protected]> * [AKS] Update on trustedaccess resource (Azure#18947) * Add paging for trusted access * update async state * fixup! update async state * Use enum for TrustedAccessRoleBinding's ProvisioningState (Azure#18950) Co-authored-by: Tyler Lloyd <[email protected]> Co-authored-by: gossion <[email protected]> Co-authored-by: Dong Liu <[email protected]> Co-authored-by: Shiqian Tao <[email protected]> Co-authored-by: Ji'an Liu <[email protected]> Co-authored-by: Mikołaj Umański <[email protected]> Co-authored-by: Mikolaj Umanski <[email protected]>
1 parent 36eb637 commit 95eada8

File tree

107 files changed

+20919
-1
lines changed

Some content is hidden

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

107 files changed

+20919
-1
lines changed

‎custom-words.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,7 @@ CVSS
489489
cyclicity
490490
Cyrl
491491
dacl
492+
DaemonSet
492493
dailyforecast
493494
dailyhistorical
494495
dapr

‎specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-04-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-04-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-04-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-04-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+
}

‎specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-04-02-preview/examples/AgentPoolsCreate_DedicatedHostGroup.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-04-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+
"currentOrchestratorVersion": "1.19.6",
28+
"count": 3,
29+
"vmSize": "Standard_DS2_v2",
30+
"maxPods": 110,
31+
"osType": "Linux",
32+
"hostGroupID": "/subscriptions/subid1/resourcegroups/rg/providers/Microsoft.Compute/hostGroups/hostgroup1"
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.19.6",
44+
"currentOrchestratorVersion": "1.19.6",
45+
"count": 3,
46+
"vmSize": "Standard_DS2_v2",
47+
"maxPods": 110,
48+
"osType": "Linux",
49+
"hostGroupID": "/subscriptions/subid1/resourcegroups/rg/providers/Microsoft.Compute/hostGroups/hostgroup1"
50+
}
51+
}
52+
}
53+
}
54+
}

‎specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-04-02-preview/examples/AgentPoolsCreate_EnableCustomCATrust.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-04-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+
"enableCustomCATrust": 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+
"currentOrchestratorVersion": "1.19.6",
28+
"count": 3,
29+
"vmSize": "Standard_DS2_v2",
30+
"maxPods": 110,
31+
"osType": "Linux",
32+
"enableCustomCATrust": true
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.19.6",
44+
"currentOrchestratorVersion": "1.19.6",
45+
"count": 3,
46+
"vmSize": "Standard_DS2_v2",
47+
"maxPods": 110,
48+
"osType": "Linux",
49+
"enableCustomCATrust": true
50+
}
51+
}
52+
}
53+
}
54+
}

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

0 commit comments

Comments
 (0)