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

Jump to bottom

AKS: Add changes for resource consumption for Azure Container Storage #7215

Merged
merged 32 commits into from
Mar 15, 2024
Merged

AKS: Add changes for resource consumption for Azure Container Storage #7215

Show file tree
Hide file tree
Changes from 31 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
c719490
Adding support to enable and disable storagepool types in Azure Conta…
mukhoakash Jan 25, 2024
3cc09e3
Changing the helm value to global
mukhoakash Jan 28, 2024
612cf21
More feature additions and fixes
mukhoakash Feb 28, 2024
7684128
Merge branch 'main' of github.com:Azure/azure-cli-extensions into acs…
mukhoakash Feb 28, 2024
5b47e73
Removing a log and fixing a test
mukhoakash Feb 28, 2024
5e2c1a7
Test case fix
mukhoakash Feb 28, 2024
987fbb8
Introducing vm size check to acstor install
mukhoakash Mar 7, 2024
ce6f165
Merge branch 'main' of github.com:Azure/azure-cli-extensions into acs…
mukhoakash Mar 7, 2024
12d5a92
Final changes
mukhoakash Mar 8, 2024
0dff60f
Some fixes around default setting of cluster
mukhoakash Mar 8, 2024
d2774d7
Merge branch 'main' of github.com:Azure/azure-cli-extensions into acs…
mukhoakash Mar 8, 2024
4ab9baf
Handling the initial state for disabling of storagepool
mukhoakash Mar 8, 2024
c501f64
Fixes to the current state of cluster configuration for helm values
mukhoakash Mar 9, 2024
3ecd8ce
Updated HISTORY
mukhoakash Mar 11, 2024
df53cdd
Merge branch 'main' of github.com:Azure/azure-cli-extensions into acs…
mukhoakash Mar 12, 2024
c41a868
Lint fixes
mukhoakash Mar 12, 2024
e7b1d4e
Test case fixes
mukhoakash Mar 12, 2024
8c3aa31
Intendation fixes
mukhoakash Mar 12, 2024
1f19ff2
Lint fixes
mukhoakash Mar 13, 2024
ee57fff
Lint fixes continued
mukhoakash Mar 13, 2024
6df986c
Revert "Lint fixes continued"
mukhoakash Mar 14, 2024
7f99be8
Revert "Lint fixes"
mukhoakash Mar 14, 2024
6c8191e
Lint fixes completed
mukhoakash Mar 14, 2024
d0e8d11
Removing rp registration and add support to assign Azure Container St…
mukhoakash Mar 14, 2024
2556842
Some more lint fixes
mukhoakash Mar 14, 2024
2cabff5
Removing obsolete changes
mukhoakash Mar 14, 2024
77daf24
Reanabling a test automation case
mukhoakash Mar 14, 2024
020cb7c
Marking th etest live only
mukhoakash Mar 14, 2024
6f442da
Adding a sleep time between runs
mukhoakash Mar 14, 2024
0aeaf88
Fixing the release train
mukhoakash Mar 15, 2024
0908d98
Introducing Reader role to bridge the Network RP read gap
mukhoakash Mar 15, 2024
30cba19
Updating the version in setup.py
mukhoakash Mar 15, 2024
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
5 changes: 5 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,11 @@ To release a new version, please select a new version number (usually plus 1 to
Pending
+++++++

2.0.0b5
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please update VERSION in setup.py so the change could be released.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

+++++++
* Add support to enable and disable a single type of storagepool using `--enable-azure-container-storage` and `--disable-azure-container-storage` respectively.
* Add support to define the resource allocation to Azure Container Storage applications based on the type of node pools used and storagepools enabled.

2.0.0b4
+++++++
* Add `--enable-vtpm` to `az aks create`, `az aks nodepool add` and `az aks nodepool update`.
Expand Down
21 changes: 18 additions & 3 deletions src/aks-preview/azext_aks_preview/_params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@
validate_artifact_streaming,
)
from azext_aks_preview.azurecontainerstorage._consts import (
CONST_ACSTOR_ALL,
CONST_STORAGE_POOL_TYPE_AZURE_DISK,
CONST_STORAGE_POOL_TYPE_EPHEMERAL_DISK,
CONST_STORAGE_POOL_TYPE_ELASTIC_SAN,
Expand Down Expand Up @@ -316,6 +317,13 @@
CONST_STORAGE_POOL_TYPE_ELASTIC_SAN,
]

disable_storage_pool_types = [
CONST_STORAGE_POOL_TYPE_AZURE_DISK,
CONST_STORAGE_POOL_TYPE_EPHEMERAL_DISK,
CONST_STORAGE_POOL_TYPE_ELASTIC_SAN,
CONST_ACSTOR_ALL,
]

storage_pool_skus = [
CONST_STORAGE_POOL_SKU_PREMIUM_LRS,
CONST_STORAGE_POOL_SKU_STANDARD_LRS,
Expand All @@ -331,6 +339,13 @@
CONST_STORAGE_POOL_OPTION_SSD,
]

disable_storage_pool_options = [
CONST_STORAGE_POOL_OPTION_NVME,
CONST_STORAGE_POOL_OPTION_SSD,
CONST_ACSTOR_ALL,
]

# consts for guardrails level
node_provisioning_modes = [
CONST_NODE_PROVISIONING_MODE_MANUAL,
CONST_NODE_PROVISIONING_MODE_AUTO,
Expand Down Expand Up @@ -1194,8 +1209,8 @@ def load_arguments(self, _):
)
c.argument(
"disable_azure_container_storage",
action="store_true",
help="Flag to disable azure container storage",
arg_type=get_enum_type(disable_storage_pool_types),
help="disable azure container storage or any one of the storagepool types",
)
c.argument(
"storage_pool_name",
Expand All @@ -1212,7 +1227,7 @@ def load_arguments(self, _):
)
c.argument(
"storage_pool_option",
arg_type=get_enum_type(storage_pool_options),
arg_type=get_enum_type(disable_storage_pool_options),
help="set ephemeral disk storage pool option for azure container storage",
)
c.argument(
Expand Down
5 changes: 2 additions & 3 deletions src/aks-preview/azext_aks_preview/azurecontainerstorage/_consts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# Licensed under the MIT License. See License.txt in the project root for license information.
# --------------------------------------------------------------------------------------------

CONST_ACSTOR_ALL = "all"
CONST_ACSTOR_IO_ENGINE_LABEL_KEY = "acstor.azure.com/io-engine"
CONST_ACSTOR_IO_ENGINE_LABEL_VAL = "acstor"
CONST_ACSTOR_K8S_EXTENSION_NAME = "microsoft.azurecontainerstorage"
Expand All @@ -14,7 +15,7 @@
CONST_STORAGE_POOL_DEFAULT_SIZE = "512Gi"
CONST_STORAGE_POOL_NAME_PREFIX = "storagepool-"
CONST_STORAGE_POOL_OPTION_NVME = "NVMe"
CONST_STORAGE_POOL_OPTION_SSD = "SSD"
CONST_STORAGE_POOL_OPTION_SSD = "Temp"
CONST_STORAGE_POOL_SKU_PREMIUM_LRS = "Premium_LRS"
CONST_STORAGE_POOL_SKU_PREMIUM_ZRS = "Premium_ZRS"
CONST_STORAGE_POOL_SKU_PREMIUMV2_LRS = "PremiumV2_LRS"
Expand All @@ -25,5 +26,3 @@
CONST_STORAGE_POOL_TYPE_AZURE_DISK = "azureDisk"
CONST_STORAGE_POOL_TYPE_ELASTIC_SAN = "elasticSan"
CONST_STORAGE_POOL_TYPE_EPHEMERAL_DISK = "ephemeralDisk"

RP_REGISTRATION_POLLING_INTERVAL_IN_SEC = 5
Loading