Skip to content

Commit 33f7cd1

Browse files
committed
Fix some issues and add History notes
1 parent a8b8b74 commit 33f7cd1

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

src/aks-preview/HISTORY.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@ To release a new version, please select a new version number (usually plus 1 to
1212
Pending
1313
+++++++
1414

15+
18.0.0b37
16+
+++++++
17+
* `az aks create`: Add new parameter `--container-storage-version` to enable the given version of Azure Container Storage.
18+
* `az aks update`: Add new parameter `--container-storage-version` to enable the given version of Azure Container Storage.
19+
* `az aks create`: Change behavior of `--enable-azure-container-storage` to enable latest Azure Container Storage by default.
20+
* `az aks update`: Change behavior of `--enable-azure-container-storage` to enable latest Azure Container Storage by default.
21+
* `az aks update`: Change behavior of `--disable-azure-container-storage` to handle disable based on the installed version.
22+
1523
18.0.0b36
1624
+++++++
1725
* Add option `AzureLinux3` to `--os-sku` for `az aks nodepool add` and `az aks nodepool update`.

src/aks-preview/azext_aks_preview/managed_cluster_decorator.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4106,7 +4106,7 @@ def postprocessing_after_mc_created(self, cluster: ManagedCluster) -> None:
41064106
enable_azure_container_storage = self.context.get_intermediate("enable_azure_container_storage")
41074107
container_storage_version = self.context.get_intermediate("container_storage_version")
41084108
if enable_azure_container_storage:
4109-
if container_storage_version is None and container_storage_version == CONST_ACSTOR_VERSION_V1:
4109+
if container_storage_version is not None and container_storage_version == CONST_ACSTOR_VERSION_V1:
41104110
if cluster.identity_profile is None or cluster.identity_profile["kubeletidentity"] is None:
41114111
logger.warning(
41124112
"Unexpected error getting kubelet's identity for the cluster. "
@@ -4188,12 +4188,6 @@ def postprocessing_after_mc_created(self, cluster: ManagedCluster) -> None:
41884188
scope=cluster.id,
41894189
resolve_assignee=False,
41904190
)
4191-
else:
4192-
self.context.external_functions.perform_enable_azure_container_storage(
4193-
self.cmd,
4194-
self.context.get_resource_group_name(),
4195-
self.context.get_name(),
4196-
)
41974191

41984192

41994193
class AKSPreviewManagedClusterUpdateDecorator(AKSManagedClusterUpdateDecorator):

src/aks-preview/azext_aks_preview/tests/latest/test_validators.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1522,7 +1522,7 @@ def test_extension_installed_storagepool_type_installed(self):
15221522
storage_pool_size = "5Ti"
15231523
storage_pool_type = acstor_consts.CONST_STORAGE_POOL_TYPE_AZURE_DISK
15241524
storage_pool_sku = acstor_consts.CONST_STORAGE_POOL_SKU_PREMIUM_LRS
1525-
agentpools = {"nodepool1": {"node_labels": {"acstor.azure.com/io-engine": "acstor"}, "count": 3}, "nodepool2" :{}}
1525+
agentpools = {"nodepool1": {"node_labels": {"acstor.azure.com/io-engine": "acstor"}, "count": 3}, "nodepool2": {}}
15261526
err = (
15271527
"Invalid --enable-azure-container-storage value. "
15281528
"Azure Container Storage is already enabled for storage pool type "

0 commit comments

Comments
 (0)