From dab9ec554ca3a32bcc2eb0fd1616c4b3c8dc0b77 Mon Sep 17 00:00:00 2001 From: Zachary Bailey Date: Mon, 29 Jun 2026 17:03:12 -0400 Subject: [PATCH] fix --- src/aks-preview/HISTORY.rst | 4 ++++ src/aks-preview/azext_aks_preview/_consts.py | 1 + src/aks-preview/azext_aks_preview/_help.py | 4 ++-- src/aks-preview/azext_aks_preview/_params.py | 3 +++ src/aks-preview/setup.py | 2 +- 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/aks-preview/HISTORY.rst b/src/aks-preview/HISTORY.rst index c36fe8b94ca..6ccfba745f1 100644 --- a/src/aks-preview/HISTORY.rst +++ b/src/aks-preview/HISTORY.rst @@ -12,6 +12,10 @@ To release a new version, please select a new version number (usually plus 1 to Pending +++++++ +21.0.0b8 +++++++++ +* Add option `Ubuntu2604` to `--os-sku` for `az aks nodepool add` and `az aks nodepool update`. + 21.0.0b7 ++++++++ * `az aks create`: Add `--node-disruption-policy` (preview) to set the node disruption policy at cluster creation time. Requires AFEC registration `Microsoft.ContainerService/NodeDisruptionProfile`. This is a cluster-level property that applies to all node pools in the cluster. diff --git a/src/aks-preview/azext_aks_preview/_consts.py b/src/aks-preview/azext_aks_preview/_consts.py index cce7f0d762a..6b0ab3d2b1a 100644 --- a/src/aks-preview/azext_aks_preview/_consts.py +++ b/src/aks-preview/azext_aks_preview/_consts.py @@ -43,6 +43,7 @@ CONST_OS_SKU_FLATCAR = "Flatcar" CONST_OS_SKU_UBUNTU2204 = "Ubuntu2204" CONST_OS_SKU_UBUNTU2404 = "Ubuntu2404" +CONST_OS_SKU_UBUNTU2604 = "Ubuntu2604" CONST_OS_SKU_AZURELINUXOSGUARD = "AzureLinuxOSGuard" CONST_OS_SKU_AZURELINUX3OSGUARD = "AzureLinux3OSGuard" CONST_OS_SKU_AZURECONTAINERLINUX = "AzureContainerLinux" diff --git a/src/aks-preview/azext_aks_preview/_help.py b/src/aks-preview/azext_aks_preview/_help.py index 6d04154ca5d..a591b73b141 100644 --- a/src/aks-preview/azext_aks_preview/_help.py +++ b/src/aks-preview/azext_aks_preview/_help.py @@ -287,7 +287,7 @@ short-summary: The ID of a PPG. - name: --os-sku type: string - short-summary: The os-sku of the agent node pool. Ubuntu, Ubuntu2204, Ubuntu2404, CBLMariner, AzureLinux, AzureLinux3, AzureLinuxOSGuard, AzureLinux3OSGuard, AzureContainerLinux, or Flatcar 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. + short-summary: The os-sku of the agent node pool. Ubuntu, Ubuntu2204, Ubuntu2404, Ubuntu2604, CBLMariner, AzureLinux, AzureLinux3, AzureLinuxOSGuard, AzureLinux3OSGuard, AzureContainerLinux, or Flatcar 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. @@ -2374,7 +2374,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, AzureLinux3OSGuard, AzureContainerLinux, or Flatcar 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. + short-summary: The os-sku of the agent node pool. Ubuntu, Ubuntu2204, Ubuntu2404, Ubuntu2604, CBLMariner, AzureLinux, AzureLinux3, AzureLinuxOSGuard, AzureLinux3OSGuard, AzureContainerLinux, or Flatcar 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. diff --git a/src/aks-preview/azext_aks_preview/_params.py b/src/aks-preview/azext_aks_preview/_params.py index c91f3c11139..5f1c087ac93 100644 --- a/src/aks-preview/azext_aks_preview/_params.py +++ b/src/aks-preview/azext_aks_preview/_params.py @@ -108,6 +108,7 @@ CONST_OS_SKU_UBUNTU, CONST_OS_SKU_UBUNTU2204, CONST_OS_SKU_UBUNTU2404, + CONST_OS_SKU_UBUNTU2604, CONST_OS_SKU_WINDOWS2019, CONST_OS_SKU_WINDOWS2022, CONST_OS_SKU_WINDOWS2025, @@ -307,6 +308,7 @@ CONST_OS_SKU_MARINER, CONST_OS_SKU_UBUNTU2204, CONST_OS_SKU_UBUNTU2404, + CONST_OS_SKU_UBUNTU2604, CONST_OS_SKU_AZURELINUXOSGUARD, CONST_OS_SKU_AZURELINUX3OSGUARD, CONST_OS_SKU_AZURECONTAINERLINUX, @@ -324,6 +326,7 @@ CONST_OS_SKU_UBUNTU, CONST_OS_SKU_UBUNTU2204, CONST_OS_SKU_UBUNTU2404, + CONST_OS_SKU_UBUNTU2604, CONST_OS_SKU_AZURELINUXOSGUARD, CONST_OS_SKU_AZURELINUX3OSGUARD, CONST_OS_SKU_AZURECONTAINERLINUX, diff --git a/src/aks-preview/setup.py b/src/aks-preview/setup.py index 31c52a1dfc0..e2dddd9e83e 100644 --- a/src/aks-preview/setup.py +++ b/src/aks-preview/setup.py @@ -9,7 +9,7 @@ from setuptools import find_packages, setup -VERSION = "21.0.0b7" +VERSION = "21.0.0b8" CLASSIFIERS = [ "Development Status :: 4 - Beta",