Skip to content

Commit

Permalink
Dev containerservice microsoft.container service 2020 11 01 (#11588)
Browse files Browse the repository at this point in the history 
* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

Co-authored-by: Xiahe Liu <[email protected]>
Co-authored-by: Paul Miller <[email protected]>
Co-authored-by: hbc <[email protected]>
Co-authored-by: Super <[email protected]>
Co-authored-by: Li Ma <[email protected]>
Co-authored-by: Qingchuan Hao <[email protected]>
Co-authored-by: Tongyao Si <[email protected]>
Co-authored-by: Bo Wang <[email protected]>
Co-authored-by: Phoenix He <[email protected]>
  • Loading branch information
@xhl873 @paulgmiller
@bcho @levimm @mainred @norshtein @bowang-666
10 people authored Nov 11, 2020
1 parent 9f3c67d commit 39b37ea
Show file tree
Hide file tree
Showing 42 changed files with 6,093 additions and 8 deletions.
32 changes: 32 additions & 0 deletions custom-words.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1996,6 +1996,38 @@ Appxmanifest
msixpackage
xml
Creds
<<<<<<< dev-containerservice-Microsoft.ContainerService-2020-11-01
kubelet
Kubelet
sysctl
Sysctl
sysctls
Sysctls
defrag
Defrag
somaxconn
Somaxconn
netdev
Netdev
rmem
Rmem
wmem
Wmem
optmem
Optmem
Tcpkeepalive
intvl
Intvl
netfilter
Netfilter
conntrack
Conntrack
inotify
Inotify
swappiness
Swappiness
=======
>>>>>>> master
unarchive
unarchiving
ssoadfs
Expand Down
121 changes: 121 additions & 0 deletions ...rosoft.ContainerService/stable/2020-11-01/examples/AgentPoolsCreate_CustomNodeConfig.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
{
"parameters": {
"api-version": "2020-11-01",
"subscriptionId": "subid1",
"resourceGroupName": "rg1",
"resourceName": "clustername1",
"agentPoolName": "agentpool1",
"parameters": {
"properties": {
"orchestratorVersion": "",
"count": 3,
"vmSize": "Standard_DS2_v2",
"osType": "Linux",
"kubeletConfig": {
"cpuManagerPolicy": "static",
"cpuCfsQuota": true,
"cpuCfsQuotaPeriod": "200ms",
"imageGcHighThreshold": 90,
"imageGcLowThreshold": 70,
"topologyManagerPolicy": "best-effort",
"allowedUnsafeSysctls": [
"kernel.msg*",
"net.core.somaxconn"
],
"failSwapOn": false
},
"linuxOSConfig": {
"sysctls": {
"netIpv4TcpWmem": 12345,
"netIpv4TcpTwReuse": true,
"netIpv4IpLocalPortRange": "20000 60000",
"kernelThreadsMax": 99999
},
"transparentHugePageEnabled": "always",
"transparentHugePageDefrag": "madvise",
"swapFileSizeMB": 1500
}
}
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1",
"type": "Microsoft.ContainerService/managedClusters/agentPools",
"name": "agentpool1",
"properties": {
"provisioningState": "Succeeded",
"orchestratorVersion": "1.17.8",
"count": 3,
"vmSize": "Standard_DS2_v2",
"maxPods": 110,
"osType": "Linux",
"kubeletConfig": {
"cpuManagerPolicy": "static",
"cpuCfsQuota": true,
"cpuCfsQuotaPeriod": "200ms",
"imageGcHighThreshold": 90,
"imageGcLowThreshold": 70,
"topologyManagerPolicy": "best-effort",
"allowedUnsafeSysctls": [
"kernel.msg*",
"net.core.somaxconn"
],
"failSwapOn": false
},
"linuxOSConfig": {
"sysctls": {
"netIpv4TcpWmem": 12345,
"netIpv4TcpTwReuse": true,
"netIpv4IpLocalPortRange": "20000 60000",
"kernelThreadsMax": 99999
},
"transparentHugePageEnabled": "always",
"transparentHugePageDefrag": "madvise",
"swapFileSizeMB": 1500
}
}
}
},
"201": {
"body": {
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1",
"type": "Microsoft.ContainerService/managedClusters/agentPools",
"name": "agentpool1",
"properties": {
"provisioningState": "Creating",
"orchestratorVersion": "1.17.8",
"count": 3,
"vmSize": "Standard_DS2_v2",
"maxPods": 110,
"osType": "Linux",
"kubeletConfig": {
"cpuManagerPolicy": "static",
"cpuCfsQuota": true,
"cpuCfsQuotaPeriod": "200ms",
"imageGcHighThreshold": 90,
"imageGcLowThreshold": 70,
"topologyManagerPolicy": "best-effort",
"allowedUnsafeSysctls": [
"kernel.msg*",
"net.core.somaxconn"
],
"failSwapOn": false
},
"linuxOSConfig": {
"sysctls": {
"netIpv4TcpWmem": 12345,
"netIpv4TcpTwReuse": true,
"netIpv4IpLocalPortRange": "20000 60000",
"kernelThreadsMax": 99999
},
"transparentHugePageEnabled": "always",
"transparentHugePageDefrag": "madvise",
"swapFileSizeMB": 1500
}
}
}
}
}
}
55 changes: 55 additions & 0 deletions ...ger/Microsoft.ContainerService/stable/2020-11-01/examples/AgentPoolsCreate_Ephemeral.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"parameters": {
"api-version": "2020-11-01",
"subscriptionId": "subid1",
"resourceGroupName": "rg1",
"resourceName": "clustername1",
"agentPoolName": "agentpool1",
"parameters": {
"properties": {
"orchestratorVersion": "",
"count": 3,
"vmSize": "Standard_DS2_v2",
"osType": "Linux",
"osDiskType": "Ephemeral",
"osDiskSizeGB": 64
}
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1",
"type": "Microsoft.ContainerService/managedClusters/agentPools",
"name": "agentpool1",
"properties": {
"provisioningState": "Succeeded",
"orchestratorVersion": "1.17.8",
"count": 3,
"vmSize": "Standard_DS2_v2",
"maxPods": 110,
"osType": "Linux",
"osDiskType": "Ephemeral",
"osDiskSizeGB": 64
}
}
},
"201": {
"body": {
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1",
"type": "Microsoft.ContainerService/managedClusters/agentPools",
"name": "agentpool1",
"properties": {
"provisioningState": "Creating",
"orchestratorVersion": "1.17.8",
"count": 3,
"vmSize": "Standard_DS2_v2",
"maxPods": 110,
"osType": "Linux",
"osDiskType": "Ephemeral",
"osDiskSizeGB": 64
}
}
}
}
}
52 changes: 52 additions & 0 deletions ...e-manager/Microsoft.ContainerService/stable/2020-11-01/examples/AgentPoolsCreate_PPG.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"parameters": {
"api-version": "2020-11-01",
"subscriptionId": "subid1",
"resourceGroupName": "rg1",
"resourceName": "clustername1",
"agentPoolName": "agentpool1",
"parameters": {
"properties": {
"orchestratorVersion": "",
"count": 3,
"vmSize": "Standard_DS2_v2",
"osType": "Linux",
"proximityPlacementGroupID": "/subscriptions/subid1/resourcegroups/rg1/providers//Microsoft.Compute/proximityPlacementGroups/ppg1"
}
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1",
"type": "Microsoft.ContainerService/managedClusters/agentPools",
"name": "agentpool1",
"properties": {
"provisioningState": "Succeeded",
"orchestratorVersion": "1.9.6",
"count": 3,
"vmSize": "Standard_DS2_v2",
"maxPods": 110,
"osType": "Linux",
"proximityPlacementGroupID": "/subscriptions/subid1/resourcegroups/rg1/providers//Microsoft.Compute/proximityPlacementGroups/ppg1"
}
}
},
"201": {
"body": {
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1",
"type": "Microsoft.ContainerService/managedClusters/agentPools",
"name": "agentpool1",
"properties": {
"provisioningState": "Creating",
"orchestratorVersion": "1.9.6",
"count": 3,
"vmSize": "Standard_DS2_v2",
"maxPods": 110,
"osType": "Linux",
"proximityPlacementGroupID": "/subscriptions/subid1/resourcegroups/rg1/providers//Microsoft.Compute/proximityPlacementGroups/ppg1"
}
}
}
}
}
84 changes: 84 additions & 0 deletions ...-manager/Microsoft.ContainerService/stable/2020-11-01/examples/AgentPoolsCreate_Spot.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
{
"parameters": {
"api-version": "2020-11-01",
"subscriptionId": "subid1",
"resourceGroupName": "rg1",
"resourceName": "clustername1",
"agentPoolName": "agentpool1",
"parameters": {
"properties": {
"orchestratorVersion": "",
"count": 3,
"vmSize": "Standard_DS1_v2",
"osType": "Linux",
"tags": {
"name1": "val1"
},
"nodeLabels": {
"key1": "val1"
},
"nodeTaints": [
"Key1=Value1:NoSchedule"
],
"scaleSetPriority": "Spot",
"scaleSetEvictionPolicy": "Delete"
}
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1",
"type": "Microsoft.ContainerService/managedClusters/agentPools",
"name": "agentpool1",
"properties": {
"provisioningState": "Succeeded",
"orchestratorVersion": "1.9.6",
"count": 3,
"vmSize": "Standard_DS1_v2",
"maxPods": 110,
"osType": "Linux",
"tags": {
"name1": "val1"
},
"nodeLabels": {
"key1": "val1"
},
"nodeTaints": [
"Key1=Value1:NoSchedule"
],
"scaleSetPriority": "Spot",
"scaleSetEvictionPolicy": "Delete",
"spotMaxPrice": -1
}
}
},
"201": {
"body": {
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1",
"type": "Microsoft.ContainerService/managedClusters/agentPools",
"name": "agentpool1",
"properties": {
"provisioningState": "Creating",
"orchestratorVersion": "1.9.6",
"count": 3,
"vmSize": "Standard_DS1_v2",
"maxPods": 110,
"osType": "Linux",
"tags": {
"name1": "val1"
},
"nodeLabels": {
"key1": "val1"
},
"nodeTaints": [
"Key1=Value1:NoSchedule"
],
"scaleSetPriority": "Spot",
"scaleSetEvictionPolicy": "Delete",
"spotMaxPrice": -1
}
}
}
}
}
Loading

0 comments on commit 39b37ea

Please sign in to comment.