Skip to content

Commit 6c51ecc

Browse files
FumingZhangnilo19zarvdtonychen15tong chen
authored and
zman-ms
committed
[Hub Generated] Review request for Microsoft.ContainerService/aks to add version stable/2023-10-01 (#26483)
* Adds base for updating Microsoft.ContainerService/aks from version stable/2023-09-01 to version 2023-10-01 * Updates readme * Updates API version in new specs and examples * Add rest api specs for node public IP IPtags and IP-based Load Balancers (#26389) * feat: add rest api spec for node public IP IPTags * feat: add rest api spec for ip-based load balancer * Add API spec for AKS HostNetwork NSG Control (#26385) * update readme (#26388) * Update custom words for ContainerService/aks 2023-10-01 (#26481) * add CapacityReservationGroup into custom-words.txt (#26461) Co-authored-by: tong chen <[email protected]> * add lower case capacityreservationgroup (#26475) Co-authored-by: tong chen <[email protected]> --------- Co-authored-by: Tong Chen <[email protected]> Co-authored-by: tong chen <[email protected]> * restored to dev branch base (#26451) Co-authored-by: tong chen <[email protected]> * resolve conflict (#26585) --------- Co-authored-by: Qi Ni <[email protected]> Co-authored-by: Jialun Cai <[email protected]> Co-authored-by: Tong Chen <[email protected]> Co-authored-by: tong chen <[email protected]>
1 parent 18e1359 commit 6c51ecc

File tree

108 files changed

+21869
-4
lines changed

Some content is hidden

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

108 files changed

+21869
-4
lines changed

‎specification/containerservice/resource-manager/Microsoft.ContainerService/aks/readme.java.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,20 @@ batch:
8989
- tag: package-2023-08
9090
- tag: package-preview-2023-09
9191
- tag: package-2023-09
92+
- tag: package-2023-10
93+
```
94+
95+
### Tag: package-2023-10 and java
96+
97+
These settings apply only when `--tag=package-2023-10` is specified on the command line.
98+
Please also specify `--azure-libraries-for-java-folder=<path to the root directory of your azure-sdk-for-java clone>`.
99+
100+
``` yaml $(tag) == 'package-2023-10' && $(java) && $(multiapi)
101+
java:
102+
namespace: com.microsoft.azure.management.containerservice.v2023_10_01
103+
output-folder: $(azure-libraries-for-java-folder)/sdk/containerservice/mgmt-v2023_10_01
104+
regenerate-manager: true
105+
generate-interface: true
92106
```
93107

94108
### Tag: package-2023-09 and java

‎specification/containerservice/resource-manager/Microsoft.ContainerService/aks/readme.md

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,23 @@ These are the global settings for the ContainerServices API.
3434

3535
``` yaml
3636
openapi-type: arm
37-
tag: package-2023-09
37+
tag: package-2023-10
3838
```
3939
40+
41+
### Tag: package-2023-10
42+
43+
These settings apply only when `--tag=package-2023-10` is specified on the command line.
44+
45+
```yaml $(tag) == 'package-2023-10'
46+
input-file:
47+
- stable/2023-10-01/managedClusters.json
48+
```
4049
### Tag: package-2023-09
4150

4251
These settings apply only when `--tag=package-2023-09` is specified on the command line.
4352

44-
```yaml $(tag) == 'package-2023-09'
53+
``` yaml $(tag) == 'package-2023-09'
4554
input-file:
4655
- stable/2023-09-01/managedClusters.json
4756
```
@@ -50,7 +59,7 @@ input-file:
5059

5160
These settings apply only when `--tag=package-preview-2023-09` is specified on the command line.
5261

53-
```yaml $(tag) == 'package-preview-2023-09'
62+
``` yaml $(tag) == 'package-preview-2023-09'
5463
input-file:
5564
- preview/2023-09-02-preview/managedClusters.json
5665
```

‎specification/containerservice/resource-manager/Microsoft.ContainerService/aks/readme.python.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@ no-namespace-folders: true
1616
Generate all API versions currently shipped for this package
1717
1818
```yaml $(python)
19-
default-api-version: "2023-09-01"
19+
default-api-version: "2023-10-01"
2020
multiapi: true
2121
batch:
22+
- tag: package-2023-10
2223
- tag: package-2023-09
2324
- tag: package-preview-2023-09
2425
- tag: package-2023-08
@@ -96,6 +97,16 @@ perform-load: false
9697
clear-output-folder: false
9798
```
9899
100+
### Tag: package-2023-10 and python
101+
102+
These settings apply only when `--tag=package-2023-10 --python` is specified on the command line.
103+
Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.
104+
105+
``` yaml $(tag) == 'package-2023-10' && $(python)
106+
namespace: azure.mgmt.containerservice.v2023_10_01
107+
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2023_10_01
108+
```
109+
99110
### Tag: package-2023-09 and python
100111

101112
These settings apply only when `--tag=package-2023-09 --python` is specified on the command line.

‎specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2023-10-01/examples/AgentPoolsAbortOperation.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"parameters": {
3+
"api-version": "2023-10-01",
4+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
5+
"resourceGroupName": "rg1",
6+
"resourceName": "clustername1",
7+
"agentPoolName": "agentpool1"
8+
},
9+
"responses": {
10+
"204": {},
11+
"202": {
12+
"headers": {
13+
"location": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerService/locations/eastus/operations/00000000-0000-0000-0000-000000000000?api-version=2023-10-01",
14+
"Azure-AsyncOperation": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ContainerService/locations/eastus/operationStatus/00000000-0000-0000-0000-000000000000?api-version=2023-10-01"
15+
}
16+
}
17+
}
18+
}

‎specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2023-10-01/examples/AgentPoolsCreate_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": "2023-10-01",
4+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
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/00000000-0000-0000-0000-000000000000/resourcegroups/rg1/providers/Microsoft.Compute/CapacityReservationGroups/crg1"
15+
}
16+
}
17+
},
18+
"responses": {
19+
"200": {
20+
"body": {
21+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/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/00000000-0000-0000-0000-000000000000/resourcegroups/rg1/providers/Microsoft.Compute/CapacityReservationGroups/crg1"
33+
}
34+
}
35+
},
36+
"201": {
37+
"body": {
38+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/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/00000000-0000-0000-0000-000000000000/resourcegroups/rg1/providers/Microsoft.Compute/CapacityReservationGroups/crg1"
50+
}
51+
}
52+
}
53+
}
54+
}

‎specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2023-10-01/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": "2023-10-01",
4+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
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/00000000-0000-0000-0000-000000000000/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/00000000-0000-0000-0000-000000000000/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/aks/stable/2023-10-01/examples/AgentPoolsCreate_DedicatedHostGroup.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": "2023-10-01",
4+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
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/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.Compute/hostGroups/hostgroup1"
15+
}
16+
}
17+
},
18+
"responses": {
19+
"200": {
20+
"body": {
21+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/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+
"count": 3,
28+
"vmSize": "Standard_DS2_v2",
29+
"maxPods": 110,
30+
"osType": "Linux",
31+
"hostGroupID": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.Compute/hostGroups/hostgroup1"
32+
}
33+
}
34+
},
35+
"201": {
36+
"body": {
37+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/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.19.6",
43+
"count": 3,
44+
"vmSize": "Standard_DS2_v2",
45+
"maxPods": 110,
46+
"osType": "Linux",
47+
"hostGroupID": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.Compute/hostGroups/hostgroup1"
48+
}
49+
}
50+
}
51+
}
52+
}

‎specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2023-10-01/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": "2023-10-01",
4+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
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/00000000-0000-0000-0000-000000000000/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/00000000-0000-0000-0000-000000000000/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)