Skip to content

Commit 3e71b78

Browse files
authored
[AKS] Add option Windows2025 to --os-sku for az aks nodepool add (#9178)
1 parent f7dcb34 commit 3e71b78

File tree

6 files changed

+2319
-4
lines changed

6 files changed

+2319
-4
lines changed

src/aks-preview/HISTORY.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ To release a new version, please select a new version number (usually plus 1 to
1111

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

1516
18.0.0b39
1617
+++++++

src/aks-preview/azext_aks_preview/_consts.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
CONST_OS_SKU_MARINER = "Mariner"
3737
CONST_OS_SKU_WINDOWS2019 = "Windows2019"
3838
CONST_OS_SKU_WINDOWS2022 = "Windows2022"
39+
CONST_OS_SKU_WINDOWS2025 = "Windows2025"
3940
CONST_OS_SKU_WINDOWSANNUAL = "WindowsAnnual"
4041
CONST_OS_SKU_AZURELINUX = "AzureLinux"
4142
CONST_OS_SKU_AZURELINUX3 = "AzureLinux3"

src/aks-preview/azext_aks_preview/_help.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1928,7 +1928,7 @@
19281928
short-summary: The OS Type. Linux or Windows. Windows not supported yet for "VirtualMachines" VM set type.
19291929
- name: --os-sku
19301930
type: string
1931-
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.
1931+
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.
19321932
- name: --enable-fips-image
19331933
type: bool
19341934
short-summary: Use FIPS-enabled OS on agent nodes.

src/aks-preview/azext_aks_preview/_params.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@
102102
CONST_OS_SKU_UBUNTU2404,
103103
CONST_OS_SKU_WINDOWS2019,
104104
CONST_OS_SKU_WINDOWS2022,
105+
CONST_OS_SKU_WINDOWS2025,
105106
CONST_OS_SKU_WINDOWSANNUAL,
106107
CONST_PATCH_UPGRADE_CHANNEL,
107108
CONST_RAPID_UPGRADE_CHANNEL,
@@ -287,9 +288,10 @@
287288
CONST_OS_SKU_AZURELINUXOSGUARD,
288289
CONST_OS_SKU_AZURELINUX3OSGUARD,
289290
]
290-
node_os_skus = node_os_skus_create + [
291+
node_os_skus_add = node_os_skus_create + [
291292
CONST_OS_SKU_WINDOWS2019,
292293
CONST_OS_SKU_WINDOWS2022,
294+
CONST_OS_SKU_WINDOWS2025,
293295
CONST_OS_SKU_WINDOWSANNUAL,
294296
]
295297
node_os_skus_update = [
@@ -1675,7 +1677,7 @@ def load_arguments(self, _):
16751677
)
16761678
c.argument("os_type")
16771679
c.argument(
1678-
"os_sku", arg_type=get_enum_type(node_os_skus), validator=validate_os_sku
1680+
"os_sku", arg_type=get_enum_type(node_os_skus_add), validator=validate_os_sku
16791681
)
16801682
c.argument("snapshot_id", validator=validate_snapshot_id)
16811683
c.argument("vnet_subnet_id", validator=validate_vnet_subnet_id)
@@ -2026,7 +2028,7 @@ def load_arguments(self, _):
20262028
"machine_name", help="The machine name."
20272029
)
20282030
c.argument(
2029-
"os_sku", arg_type=get_enum_type(node_os_skus), validator=validate_os_sku
2031+
"os_sku", arg_type=get_enum_type(node_os_skus_add), validator=validate_os_sku
20302032
)
20312033
c.argument(
20322034
"zones",

0 commit comments

Comments
 (0)