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

OSSKU supports Windows options #18706

Merged
merged 5 commits into from
Apr 26, 2022
Merged

OSSKU supports Windows options #18706

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3c311ce
OSSKU supports Windows options
ShiqianTao Apr 18, 2022
7f5d86b
Add example Create Agent Pool with Windows OSSKU
ShiqianTao Apr 18, 2022
27a839b
Improve description about the default value
ShiqianTao Apr 19, 2022
b65c432
Improve the description to clarify
ShiqianTao Apr 20, 2022
88e4708
Improve description about default Windows OSSKU
ShiqianTao Apr 20, 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
6 changes: 4 additions & 2 deletions ...source-manager/Microsoft.ContainerService/preview/2022-04-02-preview/managedClusters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4868,13 +4868,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."
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

So rp could handle ossku = windows2019, ostype = linux or other invalid combinations properly?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. AKS-RP validates the OSSKU value for Linux and Windows.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a default if one is not specified? For example osType = Windows, osSKU not set? If so we should document what that is (for both Windows/Linux)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good guidance. Updated.

"description": "Specifies an OS SKU. Ubuntu or CBLMariner for Linux node pool. Windows2019 or Windows2022 for Windows node pool."
},
"ScaleSetPriority": {
"type": "string",
Expand Down