Skip to content

Commit 645ad2c

Browse files
authored
[AKS] az aks nodepool add/update: Add option Ubuntu2404 to --os-sku parameter (#32509)
1 parent 11568f4 commit 645ad2c

5 files changed

Lines changed: 1665 additions & 4 deletions

File tree

src/azure-cli/azure/cli/command_modules/acs/_consts.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
CONST_OS_SKU_AZURELINUX = "AzureLinux"
4040
CONST_OS_SKU_AZURELINUX3 = "AzureLinux3"
4141
CONST_OS_SKU_UBUNTU2204 = "Ubuntu2204"
42+
CONST_OS_SKU_UBUNTU2404 = "Ubuntu2404"
4243

4344
# vm set type
4445
CONST_VIRTUAL_MACHINE_SCALE_SETS = "VirtualMachineScaleSets"

src/azure-cli/azure/cli/command_modules/acs/_help.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1853,7 +1853,7 @@
18531853
short-summary: The OS Type. Linux or Windows.
18541854
- name: --os-sku
18551855
type: string
1856-
short-summary: The OS SKU of the agent node pool. Ubuntu, Ubuntu2204, AzureLinux or AzureLinux3 for Linux. Windows2019 or Windows2022 for Windows.
1856+
short-summary: The OS SKU of the agent node pool. Ubuntu, Ubuntu2204, Ubuntu2404, AzureLinux or AzureLinux3 for Linux. Windows2019 or Windows2022 for Windows.
18571857
- name: --enable-cluster-autoscaler -e
18581858
type: bool
18591859
short-summary: Enable cluster autoscaler.

src/azure-cli/azure/cli/command_modules/acs/_params.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
CONST_NAMESPACE_DELETE_POLICY_DELETE,
4343
CONST_OS_SKU_AZURELINUX, CONST_OS_SKU_AZURELINUX3,
4444
CONST_OS_SKU_CBLMARINER, CONST_OS_SKU_MARINER,
45-
CONST_OS_SKU_UBUNTU, CONST_OS_SKU_UBUNTU2204,
45+
CONST_OS_SKU_UBUNTU, CONST_OS_SKU_UBUNTU2204, CONST_OS_SKU_UBUNTU2404,
4646
CONST_OS_SKU_WINDOWS2019, CONST_OS_SKU_WINDOWS2022,
4747
CONST_OUTBOUND_TYPE_LOAD_BALANCER, CONST_OUTBOUND_TYPE_MANAGED_NAT_GATEWAY,
4848
CONST_OUTBOUND_TYPE_USER_ASSIGNED_NAT_GATEWAY,
@@ -183,9 +183,9 @@
183183
node_eviction_policies = [CONST_SPOT_EVICTION_POLICY_DELETE, CONST_SPOT_EVICTION_POLICY_DEALLOCATE]
184184
node_os_disk_types = [CONST_OS_DISK_TYPE_MANAGED, CONST_OS_DISK_TYPE_EPHEMERAL]
185185
node_mode_types = [CONST_NODEPOOL_MODE_SYSTEM, CONST_NODEPOOL_MODE_USER, CONST_NODEPOOL_MODE_GATEWAY]
186-
node_os_skus_create = [CONST_OS_SKU_AZURELINUX, CONST_OS_SKU_AZURELINUX3, CONST_OS_SKU_UBUNTU, CONST_OS_SKU_CBLMARINER, CONST_OS_SKU_MARINER, CONST_OS_SKU_UBUNTU2204]
186+
node_os_skus_create = [CONST_OS_SKU_AZURELINUX, CONST_OS_SKU_AZURELINUX3, CONST_OS_SKU_UBUNTU, CONST_OS_SKU_CBLMARINER, CONST_OS_SKU_MARINER, CONST_OS_SKU_UBUNTU2204, CONST_OS_SKU_UBUNTU2404]
187187
node_os_skus = node_os_skus_create + [CONST_OS_SKU_WINDOWS2019, CONST_OS_SKU_WINDOWS2022]
188-
node_os_skus_update = [CONST_OS_SKU_AZURELINUX, CONST_OS_SKU_AZURELINUX3, CONST_OS_SKU_UBUNTU, CONST_OS_SKU_UBUNTU2204]
188+
node_os_skus_update = [CONST_OS_SKU_AZURELINUX, CONST_OS_SKU_AZURELINUX3, CONST_OS_SKU_UBUNTU, CONST_OS_SKU_UBUNTU2204, CONST_OS_SKU_UBUNTU2404]
189189
scale_down_modes = [CONST_SCALE_DOWN_MODE_DELETE, CONST_SCALE_DOWN_MODE_DEALLOCATE]
190190
pod_ip_allocation_modes = [CONST_NETWORK_POD_IP_ALLOCATION_MODE_DYNAMIC_INDIVIDUAL, CONST_NETWORK_POD_IP_ALLOCATION_MODE_STATIC_BLOCK]
191191

0 commit comments

Comments
 (0)