Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AKS OSSKU supports Windows options #19976

Merged
merged 2 commits into from
Jul 29, 2022
Merged

AKS OSSKU supports Windows options #19976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9291fc
OSSKU supports Windows options
ShiqianTao Jul 27, 2022
24de787
Improve description
ShiqianTao Jul 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 54 additions & 0 deletions .../Microsoft.ContainerService/stable/2022-07-01/examples/AgentPoolsCreate_WindowsOSSKU.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"parameters": {
"api-version": "2022-07-01",
"subscriptionId": "subid1",
"resourceGroupName": "rg1",
"resourceName": "clustername1",
"agentPoolName": "wnp2",
"parameters": {
"properties": {
"orchestratorVersion": "1.23.3",
"count": 3,
"vmSize": "Standard_D4s_v3",
"osType": "Windows",
"osSKU": "Windows2022"
}
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/wnp2",
"type": "Microsoft.ContainerService/managedClusters/agentPools",
"name": "wnp2",
"properties": {
"provisioningState": "Succeeded",
"orchestratorVersion": "1.23.3",
"currentOrchestratorVersion": "1.23.3",
"count": 3,
"vmSize": "Standard_D4s_v3",
"maxPods": 110,
"osType": "Windows",
"osSKU": "Windows2022"
}
}
},
"201": {
"body": {
"id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/wnp2",
"type": "Microsoft.ContainerService/managedClusters/agentPools",
"name": "wnp2",
"properties": {
"provisioningState": "Creating",
"orchestratorVersion": "1.23.3",
"currentOrchestratorVersion": "1.23.3",
"count": 3,
"vmSize": "Standard_D4s_v3",
"maxPods": 110,
"osType": "Windows",
"osSKU": "Windows2022"
}
}
}
}
}
9 changes: 7 additions & 2 deletions ...ervice/resource-manager/Microsoft.ContainerService/stable/2022-07-01/managedClusters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1044,6 +1044,9 @@
"Create Agent Pool with OSSKU": {
"$ref": "./examples/AgentPoolsCreate_OSSKU.json"
},
"Create Agent Pool with Windows OSSKU": {
"$ref": "./examples/AgentPoolsCreate_WindowsOSSKU.json"
},
"Create Agent Pool with GPUMIG": {
"$ref": "./examples/AgentPoolsCreate_GPUMIG.json"
},
Expand Down Expand Up @@ -4597,13 +4600,15 @@
"type": "string",
"enum": [
"Ubuntu",
"CBLMariner"
"CBLMariner",
"Windows2019",
"Windows2022"
],
"x-ms-enum": {
"name": "OSSKU",
"modelAsString": true
},
"description": "Specifies an OS SKU. This value must not be specified if OSType is Windows."
"description": "Specifies the OS SKU used by the agent pool. The default is Ubuntu if OSType is Linux. The default is Windows2019 when Kubernetes <= 1.24 or Windows2022 when Kubernetes >= 1.25 if OSType is Windows."
},
"ScaleSetPriority": {
"type": "string",
Expand Down