Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AKS: Rearrange a few helm values for Azure container storage #6883

Merged
merged 2 commits into from
Oct 20, 2023
Merged

AKS: Rearrange a few helm values for Azure container storage #6883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a01c3f0
Fixing a return statement and rearranging a few helm values
mukhoakash Oct 20, 2023
e929600
Updating the version
mukhoakash Oct 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/aks-preview/HISTORY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/aks-preview/azext_aks_preview/azurecontainerstorage/_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 5 additions & 2 deletions src/aks-preview/azext_aks_preview/azurecontainerstorage/acstor_ops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})

Expand Down
2 changes: 1 addition & 1 deletion src/aks-preview/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

from setuptools import setup, find_packages

VERSION = "0.5.164"
VERSION = "0.5.165"

CLASSIFIERS = [
"Development Status :: 4 - Beta",
Expand Down