From 91ce11901d14a0944e2c99f4c703ce2e2976088f Mon Sep 17 00:00:00 2001 From: Akash Mukhopadhyay Date: Mon, 4 Nov 2024 13:42:29 -0800 Subject: [PATCH 1/2] rename the pool name variable to avoid getting used with storagepool name --- .../azext_aks_preview/managed_cluster_decorator.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/aks-preview/azext_aks_preview/managed_cluster_decorator.py b/src/aks-preview/azext_aks_preview/managed_cluster_decorator.py index 7848e234028..a13515542bc 100644 --- a/src/aks-preview/azext_aks_preview/managed_cluster_decorator.py +++ b/src/aks-preview/azext_aks_preview/managed_cluster_decorator.py @@ -4152,7 +4152,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") @@ -4192,7 +4192,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 @@ -4203,10 +4203,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 @@ -4226,7 +4226,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, @@ -4300,7 +4300,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, From 48cc74c8b21ab127d79e27ef04e8a4867894f087 Mon Sep 17 00:00:00 2001 From: Akash Mukhopadhyay Date: Mon, 4 Nov 2024 14:10:10 -0800 Subject: [PATCH 2/2] Update setup and history file --- src/aks-preview/HISTORY.rst | 4 ++++ src/aks-preview/setup.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/aks-preview/HISTORY.rst b/src/aks-preview/HISTORY.rst index 4af498295c0..1f37f0d0e1c 100644 --- 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 `_), 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. +10.0.0b2 +++++++++ +* `az aks create/update`: Fix storage pool name validation for Azure Container Storage. + 10.0.0b1 ++++++++ * [BREAKING CHANGE]: `az aks create/update`: Remove `--uptime-sla` and `--no-uptime-sla` options. diff --git a/src/aks-preview/setup.py b/src/aks-preview/setup.py index 0616f7a60ac..4fd8f8f3851 100644 --- a/src/aks-preview/setup.py +++ b/src/aks-preview/setup.py @@ -9,7 +9,7 @@ from setuptools import setup, find_packages -VERSION = "10.0.0b1" +VERSION = "10.0.0b2" CLASSIFIERS = [ "Development Status :: 4 - Beta",