Skip to content

Commit 6f3fa67

Browse files
[AKS] az aks nodepool add/update: Add option Ubuntu2204 to --os-sku parameter (#31119)
1 parent 6190c8d commit 6f3fa67

File tree

5 files changed

+1341
-4
lines changed

5 files changed

+1341
-4
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
CONST_OS_SKU_WINDOWS2019 = "Windows2019"
3737
CONST_OS_SKU_WINDOWS2022 = "Windows2022"
3838
CONST_OS_SKU_AZURELINUX = "AzureLinux"
39+
CONST_OS_SKU_UBUNTU2204 = "Ubuntu2204"
3940

4041
# vm set type
4142
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
@@ -1566,7 +1566,7 @@
15661566
short-summary: The OS Type. Linux or Windows.
15671567
- name: --os-sku
15681568
type: string
1569-
short-summary: The OS SKU of the agent node pool. Ubuntu or CBLMariner for Linux. Windows2019 or Windows2022 for Windows.
1569+
short-summary: The OS SKU of the agent node pool. Ubuntu, AzureLinux or Ubuntu2204 for Linux. Windows2019 or Windows2022 for Windows.
15701570
- name: --enable-cluster-autoscaler -e
15711571
type: bool
15721572
short-summary: Enable cluster autoscaler.

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
CONST_NODE_OS_CHANNEL_SECURITY_PATCH,
3030
CONST_NODEPOOL_MODE_SYSTEM, CONST_NODEPOOL_MODE_USER,
3131
CONST_OS_DISK_TYPE_EPHEMERAL, CONST_OS_DISK_TYPE_MANAGED,
32-
CONST_OS_SKU_AZURELINUX, CONST_OS_SKU_CBLMARINER, CONST_OS_SKU_MARINER, CONST_OS_SKU_UBUNTU,
32+
CONST_OS_SKU_AZURELINUX, CONST_OS_SKU_CBLMARINER, CONST_OS_SKU_MARINER,
33+
CONST_OS_SKU_UBUNTU, CONST_OS_SKU_UBUNTU2204,
3334
CONST_OS_SKU_WINDOWS2019, CONST_OS_SKU_WINDOWS2022,
3435
CONST_OUTBOUND_TYPE_LOAD_BALANCER, CONST_OUTBOUND_TYPE_MANAGED_NAT_GATEWAY,
3536
CONST_OUTBOUND_TYPE_USER_ASSIGNED_NAT_GATEWAY,
@@ -152,9 +153,9 @@
152153
node_eviction_policies = [CONST_SPOT_EVICTION_POLICY_DELETE, CONST_SPOT_EVICTION_POLICY_DEALLOCATE]
153154
node_os_disk_types = [CONST_OS_DISK_TYPE_MANAGED, CONST_OS_DISK_TYPE_EPHEMERAL]
154155
node_mode_types = [CONST_NODEPOOL_MODE_SYSTEM, CONST_NODEPOOL_MODE_USER]
155-
node_os_skus_create = [CONST_OS_SKU_AZURELINUX, CONST_OS_SKU_UBUNTU, CONST_OS_SKU_CBLMARINER, CONST_OS_SKU_MARINER]
156+
node_os_skus_create = [CONST_OS_SKU_AZURELINUX, CONST_OS_SKU_UBUNTU, CONST_OS_SKU_CBLMARINER, CONST_OS_SKU_MARINER, CONST_OS_SKU_UBUNTU2204]
156157
node_os_skus = node_os_skus_create + [CONST_OS_SKU_WINDOWS2019, CONST_OS_SKU_WINDOWS2022]
157-
node_os_skus_update = [CONST_OS_SKU_AZURELINUX, CONST_OS_SKU_CBLMARINER, CONST_OS_SKU_MARINER]
158+
node_os_skus_update = [CONST_OS_SKU_AZURELINUX, CONST_OS_SKU_UBUNTU, CONST_OS_SKU_UBUNTU2204]
158159
scale_down_modes = [CONST_SCALE_DOWN_MODE_DELETE, CONST_SCALE_DOWN_MODE_DEALLOCATE]
159160

160161
# consts for ManagedCluster

0 commit comments

Comments
 (0)