Skip to content

Commit 259c264

Browse files
authored
[AKS] az aks create/update: Fix storage pool name validation for Azure Container Storage (#30258)
1 parent 8ec0863 commit 259c264

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7974,7 +7974,7 @@ def update_azure_container_storage(self, mc: ManagedCluster) -> ManagedCluster:
79747974
"Encounter an unexpected error while getting agent pool profiles from the cluster "
79757975
"in the process of updating agentpool profile."
79767976
)
7977-
pool_name = self.context.raw_param.get("storage_pool_name")
7977+
storagepool_name = self.context.raw_param.get("storage_pool_name")
79787978
pool_option = self.context.raw_param.get("storage_pool_option")
79797979
pool_sku = self.context.raw_param.get("storage_pool_sku")
79807980
pool_size = self.context.raw_param.get("storage_pool_size")
@@ -8007,7 +8007,7 @@ def update_azure_container_storage(self, mc: ManagedCluster) -> ManagedCluster:
80078007
labelled_nodepool_arr = []
80088008
for agentpool in mc.agent_pool_profiles:
80098009
pool_details = {}
8010-
pool_name = agentpool.name
8010+
nodepool_name = agentpool.name
80118011
pool_details["vm_size"] = agentpool.vm_size
80128012
pool_details["count"] = agentpool.count
80138013
pool_details["os_type"] = agentpool.os_type
@@ -8018,10 +8018,10 @@ def update_azure_container_storage(self, mc: ManagedCluster) -> ManagedCluster:
80188018
node_labels = agentpool.node_labels
80198019
if node_labels is not None and \
80208020
node_labels.get(CONST_ACSTOR_IO_ENGINE_LABEL_KEY) is not None and \
8021-
pool_name is not None:
8022-
labelled_nodepool_arr.append(pool_name)
8021+
nodepool_name is not None:
8022+
labelled_nodepool_arr.append(nodepool_name)
80238023
pool_details["node_labels"] = node_labels
8024-
agentpool_details[pool_name] = pool_details
8024+
agentpool_details[nodepool_name] = pool_details
80258025

80268026
# Incase of a new installation, if the nodepool list is not defined
80278027
# then check for all the nodepools which are marked with acstor io-engine
@@ -8041,7 +8041,7 @@ def update_azure_container_storage(self, mc: ManagedCluster) -> ManagedCluster:
80418041
)
80428042
validate_enable_azure_container_storage_params(
80438043
enable_pool_type,
8044-
pool_name,
8044+
storagepool_name,
80458045
pool_sku,
80468046
pool_option,
80478047
pool_size,
@@ -8098,7 +8098,7 @@ def update_azure_container_storage(self, mc: ManagedCluster) -> ManagedCluster:
80988098
)
80998099
validate_disable_azure_container_storage_params(
81008100
disable_pool_type,
8101-
pool_name,
8101+
storagepool_name,
81028102
pool_sku,
81038103
pool_option,
81048104
pool_size,

0 commit comments

Comments
 (0)