{AKS} Add Windows2025 OS SKU support for az aks nodepool add#33246
{AKS} Add Windows2025 OS SKU support for az aks nodepool add#33246
Conversation
sinmentis
requested review from
FumingZhang,
NoriZC,
teresaritorto and
yanzhudd
as code owners
️✔️AzureCLI-FullTest
|
|
Hi @sinmentis, |
❌AzureCLI-BreakingChangeTest
Please submit your Breaking Change Pre-announcement ASAP if you haven't already. Please note:
|
|
Thank you for your contribution! We will review the pull request and get back to you soon. |
microsoft-github-policy-service
Bot
requested review from
yonzhan and
zhoxing-ms
microsoft-github-policy-service
Bot
added
Auto-Assign
|
The git hooks are available for azure-cli and azure-cli-extensions repos. They could help you run required checks before creating the PR. Please sync the latest code with latest dev branch (for azure-cli) or main branch (for azure-cli-extensions). pip install azdev --upgrade
azdev setup -c <your azure-cli repo path> -r <your azure-cli-extensions repo path>
|
There was a problem hiding this comment.
Pull request overview
This PR updates the AKS command module to accept Windows2025 as a valid --os-sku for az aks nodepool add, aligning GA CLI behavior with the already-vendored azure-mgmt-containerservice API version 2026-02-01 and the aks-preview extension.
Changes:
- Add
CONST_OS_SKU_WINDOWS2025and include it in theaks nodepool add--os-skuenum. - Update help text for
--os-skuto mention Windows2025. - Add a scenario test + recording for adding a Windows2025 nodepool (with
--enable-fips-image).
Reviewed changes
Copilot reviewed 4 out of 5 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
src/azure-cli/azure/cli/command_modules/acs/_consts.py |
Adds the Windows2025 OS SKU constant. |
src/azure-cli/azure/cli/command_modules/acs/_params.py |
Extends the --os-sku enum for aks nodepool add to include Windows2025. |
src/azure-cli/azure/cli/command_modules/acs/_help.py |
Updates parameter help text to document Windows2025 support. |
src/azure-cli/azure/cli/command_modules/acs/tests/latest/test_aks_commands.py |
Adds a scenario test for --os-sku Windows2025 nodepool add. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
@microsoft-github-policy-service agree company="Microsoft" |
- Add CONST_OS_SKU_WINDOWS2025 constant - Append Windows2025 to the node_os_skus enum list used by `az aks nodepool add` (not added to create/update lists, mirroring the existing Windows2019/2022 behavior) - Update --os-sku help text - Add scenario test test_aks_nodepool_add_with_ossku_windows2025, including live recording. Windows2025 requires FIPS enabled, so the test uses --enable-fips-image and asserts enableFips=True AB#37629980
sinmentis
force-pushed
the
shun/aks-ossku-windows2025
branch
from
fddbfbf to
7d40d54
Compare
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 6 out of 7 changed files in this pull request and generated no new comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
timmy-wright
left a comment
timmy-wright
left a comment
There was a problem hiding this comment.
I had a look at this - one comment by copilot that seems worth addressing. And probably worth thinking if there's a refactor so that there's one list of windows SKUs that's used by all other things - then when we add WS2018 and other windows versions, the PR will be smaller.
|
/azp run |
|
Azure Pipelines successfully started running 3 pipeline(s). |
|
/azp run |
|
Commenter does not have sufficient privileges for PR 33246 in repo Azure/azure-cli |
|
/azp run |
|
Azure Pipelines successfully started running 3 pipeline(s). |
Related command
az aks nodepool addDescription
Exposes the
Windows2025value in the--os-skuenum foraz aks nodepool add, resolving AB#37629980.The
azure-mgmt-containerserviceSDK (API version2026-02-01, vendored in #33223) already definesOSSKU.WINDOWS2025, and theaks-previewextension already supports this value. Today, running the following against the GA CLI fails with an argument validationerror even though the service and SDK support it:
Changes:
node_os_skus_update, matching the existing Windows2019 / Windows2022 pattern (Windows SKUs are only valid on nodepool add).
service enforces WindowsVersionCannotDisableFIPS — "FIPS cannot be disabled in Windows '2025' and later".
No SDK bump needed; no breaking changes (additive enum value only).
Testing Guide
Recorded live against a subscription with the Microsoft.ContainerService/AKSWindows2025Preview feature registered, then
verified in playback:
Manual smoke test:
History Notes
[AKS]
az aks nodepool add: Add Windows2025 as a supported value for--os-skuThis checklist is used to make sure that common guidelines for a pull request are followed.
The PR title and description has followed the guideline in Submitting Pull Requests.
I adhere to the Command Guidelines.
I adhere to the Error Handling Guidelines.