Skip to content

Commit 7464d03

Browse files
authored
AKS: Fix storage pool name validation for Azure Container Storage (Azure#8233)
1 parent 4a7218c commit 7464d03

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

src/aks-preview/HISTORY.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ If there is no rush to release a new version, please just add a description of t
99

1010
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.
1111

12+
12.0.0b2
13+
++++++++
14+
* `az aks create/update`: Fix storage pool name validation for Azure Container Storage.
15+
1216
12.0.0b1
1317
+++++++
1418
* [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.

src/aks-preview/azext_aks_preview/managed_cluster_decorator.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4049,7 +4049,7 @@ def update_azure_container_storage(self, mc: ManagedCluster) -> ManagedCluster:
40494049
"Encounter an unexpected error while getting agent pool profiles from the cluster "
40504050
"in the process of updating agentpool profile."
40514051
)
4052-
pool_name = self.context.raw_param.get("storage_pool_name")
4052+
storagepool_name = self.context.raw_param.get("storage_pool_name")
40534053
pool_option = self.context.raw_param.get("storage_pool_option")
40544054
pool_sku = self.context.raw_param.get("storage_pool_sku")
40554055
pool_size = self.context.raw_param.get("storage_pool_size")
@@ -4089,7 +4089,7 @@ def update_azure_container_storage(self, mc: ManagedCluster) -> ManagedCluster:
40894089
labelled_nodepool_arr = []
40904090
for agentpool in mc.agent_pool_profiles:
40914091
pool_details = {}
4092-
pool_name = agentpool.name
4092+
nodepool_name = agentpool.name
40934093
pool_details["vm_size"] = agentpool.vm_size
40944094
pool_details["count"] = agentpool.count
40954095
pool_details["os_type"] = agentpool.os_type
@@ -4100,10 +4100,10 @@ def update_azure_container_storage(self, mc: ManagedCluster) -> ManagedCluster:
41004100
node_labels = agentpool.node_labels
41014101
if node_labels is not None and \
41024102
node_labels.get(CONST_ACSTOR_IO_ENGINE_LABEL_KEY) is not None and \
4103-
pool_name is not None:
4104-
labelled_nodepool_arr.append(pool_name)
4103+
nodepool_name is not None:
4104+
labelled_nodepool_arr.append(nodepool_name)
41054105
pool_details["node_labels"] = node_labels
4106-
agentpool_details[pool_name] = pool_details
4106+
agentpool_details[nodepool_name] = pool_details
41074107

41084108
# Incase of a new installation, if the nodepool list is not defined
41094109
# 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:
41234123
)
41244124
validate_enable_azure_container_storage_params(
41254125
enable_pool_type,
4126-
pool_name,
4126+
storagepool_name,
41274127
pool_sku,
41284128
pool_option,
41294129
pool_size,
@@ -4197,7 +4197,7 @@ def update_azure_container_storage(self, mc: ManagedCluster) -> ManagedCluster:
41974197
)
41984198
validate_disable_azure_container_storage_params(
41994199
disable_pool_type,
4200-
pool_name,
4200+
storagepool_name,
42014201
pool_sku,
42024202
pool_option,
42034203
pool_size,

src/aks-preview/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
from setuptools import setup, find_packages
1111

12-
VERSION = "12.0.0b1"
12+
VERSION = "12.0.0b2"
1313

1414
CLASSIFIERS = [
1515
"Development Status :: 4 - Beta",

0 commit comments

Comments
 (0)