From a01c3f013f4a4e3c2157258667d5f5040a84a37f Mon Sep 17 00:00:00 2001 From: Akash Mukhopadhyay Date: Fri, 20 Oct 2023 01:05:04 -0700 Subject: [PATCH 1/2] Fixing a return statement and rearranging a few helm values --- .../azext_aks_preview/azurecontainerstorage/_helpers.py | 2 +- .../azext_aks_preview/azurecontainerstorage/acstor_ops.py | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/aks-preview/azext_aks_preview/azurecontainerstorage/_helpers.py b/src/aks-preview/azext_aks_preview/azurecontainerstorage/_helpers.py index 720d0b25bca..46a9b099a45 100644 --- a/src/aks-preview/azext_aks_preview/azurecontainerstorage/_helpers.py +++ b/src/aks-preview/azext_aks_preview/azurecontainerstorage/_helpers.py @@ -43,7 +43,7 @@ def register_dependent_rps(cmd, subscription_id) -> bool: try: is_registered = _is_rp_registered(cmd, required_rp, subscription_id) if is_registered: - return + return True client.register(required_rp, properties=properties) # wait for registration to finish timeout_secs = 120 diff --git a/src/aks-preview/azext_aks_preview/azurecontainerstorage/acstor_ops.py b/src/aks-preview/azext_aks_preview/azurecontainerstorage/acstor_ops.py index 6bc9edfe5be..7dfe79dbac8 100644 --- a/src/aks-preview/azext_aks_preview/azurecontainerstorage/acstor_ops.py +++ b/src/aks-preview/azext_aks_preview/azurecontainerstorage/acstor_ops.py @@ -117,11 +117,14 @@ def perform_enable_azure_container_storage( ) if storage_pool_type == CONST_STORAGE_POOL_TYPE_EPHEMERAL_DISK: - config_settings.append({"cli.storagePool.ephemeralDiskOption": storage_pool_option.lower()}) + config_settings.append({"cli.storagePool.ephemeralDisk.diskType": storage_pool_option.lower()}) else: if storage_pool_sku is None: storage_pool_sku = CONST_STORAGE_POOL_SKU_PREMIUM_LRS - config_settings.append({"cli.storagePool.sku": storage_pool_sku}) + if storage_pool_type == CONST_STORAGE_POOL_TYPE_ELASTIC_SAN: + config_settings.append({"cli.storagePool.elasticSan.sku": storage_pool_sku}) + elif storage_pool_type == CONST_STORAGE_POOL_TYPE_AZURE_DISK: + config_settings.append({"cli.storagePool.azureDisk.sku": storage_pool_sku}) else: config_settings.append({"cli.storagePool.create": False}) From e92960082d084661b1807ade3e3806abf6744669 Mon Sep 17 00:00:00 2001 From: Akash Mukhopadhyay Date: Fri, 20 Oct 2023 01:17:31 -0700 Subject: [PATCH 2/2] Updating the version --- 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 fae6d0d3784..26a625561aa 100644 --- a/src/aks-preview/HISTORY.rst +++ b/src/aks-preview/HISTORY.rst @@ -12,6 +12,10 @@ To release a new version, please select a new version number (usually plus 1 to Pending +++++++ +0.5.165 ++++++++ +* Rearrange the storagepool SKU related helm values set for Azure Container Storage. + 0.5.164 +++++++ * Add option `--enable-azure-container-storage` and supporting options `--storage-pool-name`, `--storage-pool-type`, `--storage-pool-sku`, `--storage-pool-size` for `az aks create` and `az aks update`. `az aks update` also supports `--azure-container-storage-nodepools` option. diff --git a/src/aks-preview/setup.py b/src/aks-preview/setup.py index c2546eb29d1..01d3eb1055e 100644 --- a/src/aks-preview/setup.py +++ b/src/aks-preview/setup.py @@ -9,7 +9,7 @@ from setuptools import setup, find_packages -VERSION = "0.5.164" +VERSION = "0.5.165" CLASSIFIERS = [ "Development Status :: 4 - Beta",