Skip to content

Commit 39b37ea

Browse files
xhl873Xiahe Liupaulgmillerbcholevimm
authored
Dev containerservice microsoft.container service 2020 11 01 (#11588)
* Adds base for updating Microsoft.ContainerService from version stable/2020-09-01 to version 2020-11-01 * Updates readme * Updates API version in new specs and examples * add autoupgradeprofile to 2020-11-01 (#11363) * add autoupgradeprofile * add autoupgrader profile to mc * format change Co-authored-by: Xiahe Liu <Xiahe.Liu@microsoft.com> * add pod subnet id on agentpool (#11310) * aks: add pod identity profile spec (#11366) * add private dns zone property in 2020-11-01 (#11311) Co-authored-by: Li Ma <lima2@microsoft.com> * Remove invalid pattern and adjust description (#11312) * aks: fix pod identity profile field names (#11484) * aks: add missing `podIdentityProfile.enabled` field * aks: typo * add non upgrade channel (#11492) Co-authored-by: Xiahe Liu <Xiahe.Liu@microsoft.com> * Make identityProfile mutable (#11458) * Add KubeletConfig and LinuxOSConfig specs (#11490) * aks: update readme tag for 1101 (#11472) * aks: update readme tag * aks: add `2020-11-01-only` * resovle merge conlicts to master, adding recent master change to dev branch (#11604) Co-authored-by: Xiahe Liu <Xiahe.Liu@microsoft.com> Co-authored-by: Xiahe Liu <Xiahe.Liu@microsoft.com> Co-authored-by: Paul Miller <pmiller@microsoft.com> Co-authored-by: hbc <me@hbc.rocks> Co-authored-by: Super <mali_no2@hotmail.com> Co-authored-by: Li Ma <lima2@microsoft.com> Co-authored-by: Qingchuan Hao <haoqingchuan@hotmail.com> Co-authored-by: Tongyao Si <tosi@microsoft.com> Co-authored-by: Bo Wang <61758179+bowang-666@users.noreply.github.com> Co-authored-by: Phoenix He <tih@microsoft.com>
1 parent 9f3c67d commit 39b37ea

Some content is hidden

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

42 files changed

+6093
-8
lines changed

‎custom-words.txt‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1996,6 +1996,38 @@ Appxmanifest
19961996
msixpackage
19971997
xml
19981998
Creds
1999+
<<<<<<< dev-containerservice-Microsoft.ContainerService-2020-11-01
2000+
kubelet
2001+
Kubelet
2002+
sysctl
2003+
Sysctl
2004+
sysctls
2005+
Sysctls
2006+
defrag
2007+
Defrag
2008+
somaxconn
2009+
Somaxconn
2010+
netdev
2011+
Netdev
2012+
rmem
2013+
Rmem
2014+
wmem
2015+
Wmem
2016+
optmem
2017+
Optmem
2018+
Tcpkeepalive
2019+
intvl
2020+
Intvl
2021+
netfilter
2022+
Netfilter
2023+
conntrack
2024+
Conntrack
2025+
inotify
2026+
Inotify
2027+
swappiness
2028+
Swappiness
2029+
=======
2030+
>>>>>>> master
19992031
unarchive
20002032
unarchiving
20012033
ssoadfs

‎specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-11-01/examples/AgentPoolsCreate_CustomNodeConfig.json‎

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
{
2+
"parameters": {
3+
"api-version": "2020-11-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+
"netIpv4TcpWmem": 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+
"netIpv4TcpWmem": 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+
},
106+
"linuxOSConfig": {
107+
"sysctls": {
108+
"netIpv4TcpWmem": 12345,
109+
"netIpv4TcpTwReuse": true,
110+
"netIpv4IpLocalPortRange": "20000 60000",
111+
"kernelThreadsMax": 99999
112+
},
113+
"transparentHugePageEnabled": "always",
114+
"transparentHugePageDefrag": "madvise",
115+
"swapFileSizeMB": 1500
116+
}
117+
}
118+
}
119+
}
120+
}
121+
}

‎specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-11-01/examples/AgentPoolsCreate_Ephemeral.json‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
{
2+
"parameters": {
3+
"api-version": "2020-11-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+
"osDiskSizeGB": 64
51+
}
52+
}
53+
}
54+
}
55+
}

‎specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-11-01/examples/AgentPoolsCreate_PPG.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": "2020-11-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+
"proximityPlacementGroupID": "/subscriptions/subid1/resourcegroups/rg1/providers//Microsoft.Compute/proximityPlacementGroups/ppg1"
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+
"proximityPlacementGroupID": "/subscriptions/subid1/resourcegroups/rg1/providers//Microsoft.Compute/proximityPlacementGroups/ppg1"
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+
"proximityPlacementGroupID": "/subscriptions/subid1/resourcegroups/rg1/providers//Microsoft.Compute/proximityPlacementGroups/ppg1"
48+
}
49+
}
50+
}
51+
}
52+
}

‎specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-11-01/examples/AgentPoolsCreate_Spot.json‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
{
2+
"parameters": {
3+
"api-version": "2020-11-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_DS1_v2",
13+
"osType": "Linux",
14+
"tags": {
15+
"name1": "val1"
16+
},
17+
"nodeLabels": {
18+
"key1": "val1"
19+
},
20+
"nodeTaints": [
21+
"Key1=Value1:NoSchedule"
22+
],
23+
"scaleSetPriority": "Spot",
24+
"scaleSetEvictionPolicy": "Delete"
25+
}
26+
}
27+
},
28+
"responses": {
29+
"200": {
30+
"body": {
31+
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1",
32+
"type": "Microsoft.ContainerService/managedClusters/agentPools",
33+
"name": "agentpool1",
34+
"properties": {
35+
"provisioningState": "Succeeded",
36+
"orchestratorVersion": "1.9.6",
37+
"count": 3,
38+
"vmSize": "Standard_DS1_v2",
39+
"maxPods": 110,
40+
"osType": "Linux",
41+
"tags": {
42+
"name1": "val1"
43+
},
44+
"nodeLabels": {
45+
"key1": "val1"
46+
},
47+
"nodeTaints": [
48+
"Key1=Value1:NoSchedule"
49+
],
50+
"scaleSetPriority": "Spot",
51+
"scaleSetEvictionPolicy": "Delete",
52+
"spotMaxPrice": -1
53+
}
54+
}
55+
},
56+
"201": {
57+
"body": {
58+
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1",
59+
"type": "Microsoft.ContainerService/managedClusters/agentPools",
60+
"name": "agentpool1",
61+
"properties": {
62+
"provisioningState": "Creating",
63+
"orchestratorVersion": "1.9.6",
64+
"count": 3,
65+
"vmSize": "Standard_DS1_v2",
66+
"maxPods": 110,
67+
"osType": "Linux",
68+
"tags": {
69+
"name1": "val1"
70+
},
71+
"nodeLabels": {
72+
"key1": "val1"
73+
},
74+
"nodeTaints": [
75+
"Key1=Value1:NoSchedule"
76+
],
77+
"scaleSetPriority": "Spot",
78+
"scaleSetEvictionPolicy": "Delete",
79+
"spotMaxPrice": -1
80+
}
81+
}
82+
}
83+
}
84+
}

0 commit comments

Comments
 (0)