AKS: Fix storage pool name validation for Azure Container Storage (Az…

…ure#8233)
chrisribe · Nov 13, 2024 · 4ac15e7 · 4ac15e7
1 parent 035aa16
commit 4ac15e7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/src/aks-preview/HISTORY.rst b/src/aks-preview/HISTORY.rst
@@ -9,6 +9,10 @@ If there is no rush to release a new version, please just add a description of t
 
 To release a new version, please select a new version number (usually plus 1 to last patch version, X.Y.Z -> Major.Minor.Patch, more details in `\doc <https://semver.org/>`_), and then add a new section named as the new version number in this file, the content should include the new modifications and everything from the *Pending* section. Finally, update the `VERSION` variable in `setup.py` with this new version number.
 
+12.0.0b2
+++++++++
+* `az aks create/update`: Fix storage pool name validation for Azure Container Storage.
+
 12.0.0b1
 +++++++
 * [BREAKING CHANGE]: Remove advanced container networking service (acns) enablement preview parameters `--enable-advanced-network-observability`, `--disable-advanced-network-observability`, `--enable-fqdn-policy`, `--disable-fqdn-policy`, and `--advanced-networking-observability-tls-management` from `az aks create/update` command.

diff --git a/src/aks-preview/azext_aks_preview/managed_cluster_decorator.py b/src/aks-preview/azext_aks_preview/managed_cluster_decorator.py
@@ -4049,7 +4049,7 @@ def update_azure_container_storage(self, mc: ManagedCluster) -> ManagedCluster:
                     "Encounter an unexpected error while getting agent pool profiles from the cluster "
                     "in the process of updating agentpool profile."
                 )
-            pool_name = self.context.raw_param.get("storage_pool_name")
+            storagepool_name = self.context.raw_param.get("storage_pool_name")
             pool_option = self.context.raw_param.get("storage_pool_option")
             pool_sku = self.context.raw_param.get("storage_pool_sku")
             pool_size = self.context.raw_param.get("storage_pool_size")
@@ -4089,7 +4089,7 @@ def update_azure_container_storage(self, mc: ManagedCluster) -> ManagedCluster:
                 labelled_nodepool_arr = []
                 for agentpool in mc.agent_pool_profiles:
                     pool_details = {}
-                    pool_name = agentpool.name
+                    nodepool_name = agentpool.name
                     pool_details["vm_size"] = agentpool.vm_size
                     pool_details["count"] = agentpool.count
                     pool_details["os_type"] = agentpool.os_type
@@ -4100,10 +4100,10 @@ def update_azure_container_storage(self, mc: ManagedCluster) -> ManagedCluster:
                         node_labels = agentpool.node_labels
                         if node_labels is not None and \
                            node_labels.get(CONST_ACSTOR_IO_ENGINE_LABEL_KEY) is not None and \
-                           pool_name is not None:
-                            labelled_nodepool_arr.append(pool_name)
+                           nodepool_name is not None:
+                            labelled_nodepool_arr.append(nodepool_name)
                         pool_details["node_labels"] = node_labels
-                    agentpool_details[pool_name] = pool_details
+                    agentpool_details[nodepool_name] = pool_details
 
                 # Incase of a new installation, if the nodepool list is not defined
                 # then check for all the nodepools which are marked with acstor io-engine
@@ -4123,7 +4123,7 @@ def update_azure_container_storage(self, mc: ManagedCluster) -> ManagedCluster:
                 )
                 validate_enable_azure_container_storage_params(
                     enable_pool_type,
-                    pool_name,
+                    storagepool_name,
                     pool_sku,
                     pool_option,
                     pool_size,
@@ -4197,7 +4197,7 @@ def update_azure_container_storage(self, mc: ManagedCluster) -> ManagedCluster:
                 )
                 validate_disable_azure_container_storage_params(
                     disable_pool_type,
-                    pool_name,
+                    storagepool_name,
                     pool_sku,
                     pool_option,
                     pool_size,

diff --git a/src/aks-preview/setup.py b/src/aks-preview/setup.py
@@ -9,7 +9,7 @@
 
 from setuptools import setup, find_packages
 
-VERSION = "12.0.0b1"
+VERSION = "12.0.0b2"
 
 CLASSIFIERS = [
     "Development Status :: 4 - Beta",
-Original file line number
+Diff line change
@@ Expand Up @@
     To release a new version, please select a new version number (usually plus 1 to last patch version, X.Y.Z -> Major.Minor.Patch, more details in `\doc <https://semver.org/>`_), and then add a new section named as the new version number in this file, the content should include the new modifications and everything from the *Pending* section. Finally, update the `VERSION` variable in `setup.py` with this new version number.
+.0.0b2
+    ++++++++
+    * `az aks create/update`: Fix storage pool name validation for Azure Container Storage.
 .0.0b1
     +++++++
     * [BREAKING CHANGE]: Remove advanced container networking service (acns) enablement preview parameters `--enable-advanced-network-observability`, `--disable-advanced-network-observability`, `--enable-fqdn-policy`, `--disable-fqdn-policy`, and `--advanced-networking-observability-tls-management` from `az aks create/update` command.
@@ Expand Down @@