[AKS] az aks create/az aks nodepool add: No longer supports creating nodepools with ossku CBLMariner

src/aks-preview/HISTORY.rst

@@ -11,6 +11,7 @@ To release a new version, please select a new version number (usually plus 1 to
 
 Pending
 +++++++
+* `az aks create`/`az aks nodepool add`: No longer supports creating nodepools with ossku `CBLMariner`.
 * az aks create/update: Support in place param updates for managed prom
 * Vendor new SDK and bump API version to 2024-06-02-preview.
 

src/aks-preview/azext_aks_preview/_consts.py

@@ -30,7 +30,6 @@
 
 # os sku
 CONST_OS_SKU_UBUNTU = "Ubuntu"
-CONST_OS_SKU_CBLMARINER = "CBLMariner"
 CONST_OS_SKU_MARINER = "Mariner"
 CONST_OS_SKU_WINDOWS2019 = "Windows2019"
 CONST_OS_SKU_WINDOWS2022 = "Windows2022"

src/aks-preview/azext_aks_preview/_help.py

@@ -271,7 +271,7 @@
           short-summary: The ID of a PPG.
         - name: --os-sku
           type: string
-          short-summary: The os-sku of the agent node pool. Ubuntu or CBLMariner.
+          short-summary: The os-sku of the agent node pool. Ubuntu or AzureLinux.
         - name: --enable-fips-image
           type: bool
           short-summary: Use FIPS-enabled OS on agent nodes.
@@ -1737,7 +1737,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 or CBLMariner 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 or AzureLinux 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.
         - name: --enable-fips-image
           type: bool
           short-summary: Use FIPS-enabled OS on agent nodes.

src/aks-preview/azext_aks_preview/_params.py

@@ -80,7 +80,6 @@
     CONST_OS_DISK_TYPE_EPHEMERAL,
     CONST_OS_DISK_TYPE_MANAGED,
     CONST_OS_SKU_AZURELINUX,
-    CONST_OS_SKU_CBLMARINER,
     CONST_OS_SKU_MARINER,
     CONST_OS_SKU_UBUNTU,
     CONST_OS_SKU_WINDOWS2019,
@@ -222,7 +221,6 @@
 node_os_skus_create = [
     CONST_OS_SKU_AZURELINUX,
     CONST_OS_SKU_UBUNTU,
-    CONST_OS_SKU_CBLMARINER,
     CONST_OS_SKU_MARINER,
 ]
 node_os_skus = node_os_skus_create + [

src/aks-preview/azext_aks_preview/_validators.py

@@ -28,7 +28,6 @@
     CONST_MANAGED_CLUSTER_SKU_TIER_STANDARD,
     CONST_MANAGED_CLUSTER_SKU_TIER_PREMIUM,
     CONST_OS_SKU_AZURELINUX,
-    CONST_OS_SKU_CBLMARINER,
     CONST_OS_SKU_MARINER,
     CONST_NETWORK_POD_IP_ALLOCATION_MODE_DYNAMIC_INDIVIDUAL,
     CONST_NETWORK_POD_IP_ALLOCATION_MODE_STATIC_BLOCK,
@@ -813,14 +812,12 @@ def validate_start_time(namespace):
 
 def validate_os_sku(namespace):
     os_sku = namespace.os_sku
-    if os_sku in [CONST_OS_SKU_MARINER, CONST_OS_SKU_CBLMARINER]:
+    if os_sku in [CONST_OS_SKU_MARINER]:
         logger.warning(
-            'The osSKU "%s" should be used going forward instead of "%s" or "%s". '
-            'The osSKUs "%s" and "%s" will eventually be deprecated.',
+            'The osSKU "%s" should be used going forward instead of "%s". '
+            'The osSKU "%s" will eventually be deprecated.',
             CONST_OS_SKU_AZURELINUX,
-            CONST_OS_SKU_CBLMARINER,
             CONST_OS_SKU_MARINER,
-            CONST_OS_SKU_CBLMARINER,
             CONST_OS_SKU_MARINER,
         )