Skip to content

Commit

Permalink
Merge Dev-containerservice-microsoft.containerservice-2021-08-01 bran…
Browse files Browse the repository at this point in the history 
…ch to main (#15954)

* Adds base for updating Microsoft.ContainerService from version stable/2021-07-01 to version 2021-08-01

* Updates readme

* Updates API version in new specs and examples

* add publicNetworkAccess property per network platform's request (#15489)

* add publicNetworkAccess per network platform's request

* fix quota

Co-authored-by: Li Ma <lima2@microsoft.com>

* update readme for 2021-08-01 sdk generation (#15476)

* update readme for sdk generation

* update readme for sdk generation

Co-authored-by: Charlie Li <charlili@microsoft.com>

* allow disabling of runcommand (#15481)

* allow disabling of runcommand

* rename file

* another rename

* fix prittier check

* fix stupid prettier check

* change publicNetworkAccess to enum (#15564)

Co-authored-by: Li Ma <lima2@microsoft.com>

* Add CreationData property to Agentpool level in 2021-08-01 API (#15563)

* Add CreationData property to Agentpool level in 2021-08-01 API

* fix json format

* fix swagger spell check

Co-authored-by: Charlie Li <charlili@microsoft.com>

* chore: add enableMultipleStandardLoadBalancers to loadBalancerProfile (#15579)

* Add snapshot related new APIs and properties to AKS 2021-08-01 swagger (#15586)

* Add CreationData property to Agentpool level in 2021-08-01 API

* Add snapshot related APIs and properties to AKS 2021-08-01 swagger

* fix lint and spell checks

* fix lint and spell checks

* fix PrettierCheck

* Change some Nodepool to NodePool

* some changes according to ARM team's review comments

Co-authored-by: Charlie Li <charlili@microsoft.com>

* fix tag typo to match tag convention (#15683)

* add workload runtime to agent pool api (#15726)

* add workload runtime to agent pool api

* reference example

* add custom words

* fix: workload runtime description (#15782)

* fix: workload runtime description

* add wasmtime to custom words

* clarify single workload type per node

Co-authored-by: Matthew Christopher <matthchr@microsoft.com>

Co-authored-by: Matthew Christopher <matthchr@microsoft.com>

* fix typo in readme.python.md (#15903)

* Add CreationData property to Agentpool level in 2021-08-01 API

* fix typos in readme.python.md

Co-authored-by: Charlie Li <charlili@microsoft.com>

* merge recent custom-words.txt changes from main branch to resolve conflicts (#15938)

* Add CreationData property to Agentpool level in 2021-08-01 API

* merge recent custom-words.txt changes from main branch to resolve conflicts

Co-authored-by: Charlie Li <charlili@microsoft.com>

* pull custom-words.txt from main

* add a new word - NodePool

* add two more words

Co-authored-by: Super <mali_no2@hotmail.com>
Co-authored-by: Li Ma <lima2@microsoft.com>
Co-authored-by: Charlie Li <charlili@microsoft.com>
Co-authored-by: Haitao Chen <haitch@users.noreply.github.com>
Co-authored-by: Qi Ni <pomelonicky@gmail.com>
Co-authored-by: Ariel Silverman <asilverman@users.noreply.github.com>
Co-authored-by: Ace Eldeib <alexeldeib@gmail.com>
Co-authored-by: Matthew Christopher <matthchr@microsoft.com>
  • Loading branch information
@chengliangli0918 @levimm
@charlili1234 @haitch @nilo19 @asilverman @alexeldeib @matthchr
9 people authored Sep 9, 2021
1 parent 92b58eb commit c800afa
Show file tree
Hide file tree
Showing 78 changed files with 12,761 additions and 1 deletion.
3 changes: 3 additions & 0 deletions custom-words.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1019,6 +1019,7 @@ koreacentral
koreasouth
Kpis
Kraaij
Krustlet
Ksettings
kstem
kube
Expand Down Expand Up @@ -2251,6 +2252,7 @@ WANs
WASB
wasm
Wasm
wasmtime
watchlist
Watchlist
watchlists
Expand Down Expand Up @@ -2358,3 +2360,4 @@ serviceTagChangeNumber
Tebibytes
privatelinkservicesforpowerbi
Obuscated
NodePool
122 changes: 122 additions & 0 deletions ...rosoft.ContainerService/stable/2021-08-01/examples/AgentPoolsCreate_CustomNodeConfig.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
{
"parameters": {
"api-version": "2021-08-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": {
"netCoreWmemDefault": 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": {
"netCoreWmemDefault": 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,
"podMaxPids": 100
},
"linuxOSConfig": {
"sysctls": {
"netCoreWmemDefault": 65536,
"netIpv4TcpTwReuse": true,
"netIpv4IpLocalPortRange": "20000 60000",
"kernelThreadsMax": 99999
},
"transparentHugePageEnabled": "always",
"transparentHugePageDefrag": "madvise",
"swapFileSizeMB": 1500
}
}
}
}
}
}
52 changes: 52 additions & 0 deletions ....ContainerService/stable/2021-08-01/examples/AgentPoolsCreate_EnableEncryptionAtHost.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"parameters": {
"api-version": "2021-08-01",
"subscriptionId": "subid1",
"resourceGroupName": "rg1",
"resourceName": "clustername1",
"agentPoolName": "agentpool1",
"parameters": {
"properties": {
"orchestratorVersion": "",
"count": 3,
"vmSize": "Standard_DS2_v2",
"osType": "Linux",
"enableEncryptionAtHost": true
}
}
},
"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.13",
"count": 3,
"vmSize": "Standard_DS2_v2",
"maxPods": 110,
"osType": "Linux",
"enableEncryptionAtHost": true
}
}
},
"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.13",
"count": 3,
"vmSize": "Standard_DS2_v2",
"maxPods": 110,
"osType": "Linux",
"enableEncryptionAtHost": true
}
}
}
}
}
52 changes: 52 additions & 0 deletions ...er/Microsoft.ContainerService/stable/2021-08-01/examples/AgentPoolsCreate_EnableFIPS.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"parameters": {
"api-version": "2021-08-01",
"subscriptionId": "subid1",
"resourceGroupName": "rg1",
"resourceName": "clustername1",
"agentPoolName": "agentpool1",
"parameters": {
"properties": {
"orchestratorVersion": "",
"count": 3,
"vmSize": "Standard_DS2_v2",
"osType": "Linux",
"enableFIPS": true
}
}
},
"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.19.6",
"count": 3,
"vmSize": "Standard_DS2_v2",
"maxPods": 110,
"osType": "Linux",
"enableFIPS": true
}
}
},
"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.19.6",
"count": 3,
"vmSize": "Standard_DS2_v2",
"maxPods": 110,
"osType": "Linux",
"enableFIPS": true
}
}
}
}
}
52 changes: 52 additions & 0 deletions ...icrosoft.ContainerService/stable/2021-08-01/examples/AgentPoolsCreate_EnableUltraSSD.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"parameters": {
"api-version": "2021-08-01",
"subscriptionId": "subid1",
"resourceGroupName": "rg1",
"resourceName": "clustername1",
"agentPoolName": "agentpool1",
"parameters": {
"properties": {
"orchestratorVersion": "",
"count": 3,
"vmSize": "Standard_DS2_v2",
"osType": "Linux",
"enableUltraSSD": true
}
}
},
"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.13",
"count": 3,
"vmSize": "Standard_DS2_v2",
"maxPods": 110,
"osType": "Linux",
"enableUltraSSD": true
}
}
},
"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.13",
"count": 3,
"vmSize": "Standard_DS2_v2",
"maxPods": 110,
"osType": "Linux",
"enableUltraSSD": true
}
}
}
}
}
56 changes: 56 additions & 0 deletions ...ger/Microsoft.ContainerService/stable/2021-08-01/examples/AgentPoolsCreate_Ephemeral.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"parameters": {
"api-version": "2021-08-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",
"kubeletDiskType": "OS",
"osDiskSizeGB": 64
}
}
}
}
}
Loading

0 comments on commit c800afa

Please sign in to comment.