Skip to content

[AKS] Add option Windows2025 to --os-sku for az aks nodepool add #9178

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

Merged
yanzhudd merged 13 commits into from
Sep 24, 2025
Merged

[AKS] Add option Windows2025 to --os-sku for az aks nodepool add #9178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c58b01d
changes
timmy-wright Sep 18, 2025
81efaea
Update src/aks-preview/azext_aks_preview/_consts.py
timmy-wright Sep 18, 2025
0a788e4
new version number
timmy-wright Sep 18, 2025
a3060fc
.0
timmy-wright Sep 18, 2025
0598105
we don't support update
timmy-wright Sep 18, 2025
cb7e6ea
make variable more understandable
timmy-wright Sep 18, 2025
8a388d9
Merge remote-tracking branch 'upstream/main' into timmy/ws2025
timmy-wright Sep 19, 2025
2c6c500
enable fips
timmy-wright Sep 19, 2025
1afb220
bring back pending
timmy-wright Sep 19, 2025
508aa06
add recording data for new test
timmy-wright Sep 19, 2025
90f877d
pr feedback
timmy-wright Sep 22, 2025
7184f03
move pending items into release
timmy-wright Sep 22, 2025
6fb25c9
Merge branch 'main' into timmy/ws2025
FumingZhang Sep 23, 2025
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
1 change: 1 addition & 0 deletions src/aks-preview/HISTORY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ To release a new version, please select a new version number (usually plus 1 to

Pending
+++++++
* Add option `Windows2025` to `--os-sku` for `az aks nodepool add`.

18.0.0b39
+++++++
Expand Down
1 change: 1 addition & 0 deletions src/aks-preview/azext_aks_preview/_consts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
CONST_OS_SKU_MARINER = "Mariner"
CONST_OS_SKU_WINDOWS2019 = "Windows2019"
CONST_OS_SKU_WINDOWS2022 = "Windows2022"
CONST_OS_SKU_WINDOWS2025 = "Windows2025"
CONST_OS_SKU_WINDOWSANNUAL = "WindowsAnnual"
CONST_OS_SKU_AZURELINUX = "AzureLinux"
CONST_OS_SKU_AZURELINUX3 = "AzureLinux3"
Expand Down
2 changes: 1 addition & 1 deletion src/aks-preview/azext_aks_preview/_help.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1928,7 +1928,7 @@
short-summary: The OS Type. Linux or Windows. Windows not supported yet for "VirtualMachines" VM set type.
- name: --os-sku
type: string
short-summary: The os-sku of the agent node pool. Ubuntu, Ubuntu2204, Ubuntu2404, CBLMariner, AzureLinux, AzureLinux3, AzureLinuxOSGuard, or AzureLinux3OSGuard when os-type is Linux, default is Ubuntu if not set; Windows2019, Windows2022 or WindowsAnnual when os-type is Windows, the current default is Windows2022 if not set.
short-summary: The os-sku of the agent node pool. Ubuntu, Ubuntu2204, Ubuntu2404, CBLMariner, AzureLinux， AzureLinux3, AzureLinuxOSGuard, or AzureLinux3OSGuard when os-type is Linux, default is Ubuntu if not set; Windows2019, Windows2022, Windows2025, or WindowsAnnual when os-type is Windows, the current default is Windows2022 if not set.
- name: --enable-fips-image
type: bool
short-summary: Use FIPS-enabled OS on agent nodes.
Expand Down
8 changes: 5 additions & 3 deletions src/aks-preview/azext_aks_preview/_params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@
CONST_OS_SKU_UBUNTU2404,
CONST_OS_SKU_WINDOWS2019,
CONST_OS_SKU_WINDOWS2022,
CONST_OS_SKU_WINDOWS2025,
CONST_OS_SKU_WINDOWSANNUAL,
CONST_PATCH_UPGRADE_CHANNEL,
CONST_RAPID_UPGRADE_CHANNEL,
Expand Down Expand Up @@ -287,9 +288,10 @@
CONST_OS_SKU_AZURELINUXOSGUARD,
CONST_OS_SKU_AZURELINUX3OSGUARD,
]
node_os_skus = node_os_skus_create + [
node_os_skus_add = node_os_skus_create + [
CONST_OS_SKU_WINDOWS2019,
CONST_OS_SKU_WINDOWS2022,
CONST_OS_SKU_WINDOWS2025,
CONST_OS_SKU_WINDOWSANNUAL,
]
node_os_skus_update = [
Expand Down Expand Up @@ -1675,7 +1677,7 @@ def load_arguments(self, _):
)
c.argument("os_type")
c.argument(
"os_sku", arg_type=get_enum_type(node_os_skus), validator=validate_os_sku
"os_sku", arg_type=get_enum_type(node_os_skus_add), validator=validate_os_sku
)
c.argument("snapshot_id", validator=validate_snapshot_id)
c.argument("vnet_subnet_id", validator=validate_vnet_subnet_id)
Expand Down Expand Up @@ -2026,7 +2028,7 @@ def load_arguments(self, _):
"machine_name", help="The machine name."
)
c.argument(
"os_sku", arg_type=get_enum_type(node_os_skus), validator=validate_os_sku
"os_sku", arg_type=get_enum_type(node_os_skus_add), validator=validate_os_sku
)
c.argument(
"zones",
Expand Down
Loading
Loading