Skip to content

fix: catch and surface a concise err for acstor extension import error #8518

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

Merged
zhoxing-ms merged 1 commit into from
Mar 7, 2025
Merged

fix: catch and surface a concise err for acstor extension import error #8518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 19 additions & 11 deletions 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 @@ -152,17 +152,25 @@ def get_extension_installed_and_cluster_configs(
cluster_name,
agentpool_profiles
) -> Tuple[bool, bool, bool, bool, bool, float, str, str]:
client_factory = get_k8s_extension_module(CONST_K8S_EXTENSION_CLIENT_FACTORY_MOD_NAME)
client = client_factory.cf_k8s_extension_operation(cmd.cli_ctx)
k8s_extension_custom_mod = get_k8s_extension_module(CONST_K8S_EXTENSION_CUSTOM_MOD_NAME)
is_extension_installed = False
is_elasticSan_enabled = False
is_azureDisk_enabled = False
is_ephemeralDisk_nvme_enabled = False
is_ephemeralDisk_localssd_enabled = False
ephemeral_disk_volume_type = CONST_DISK_TYPE_EPHEMERAL_VOLUME_ONLY
perf_tier = CONST_EPHEMERAL_NVME_PERF_TIER_STANDARD
resource_cpu_value = -1

try:
client_factory = get_k8s_extension_module(CONST_K8S_EXTENSION_CLIENT_FACTORY_MOD_NAME)
client = client_factory.cf_k8s_extension_operation(cmd.cli_ctx)
k8s_extension_custom_mod = get_k8s_extension_module(CONST_K8S_EXTENSION_CUSTOM_MOD_NAME)
is_extension_installed = False
is_elasticSan_enabled = False
is_azureDisk_enabled = False
is_ephemeralDisk_nvme_enabled = False
is_ephemeralDisk_localssd_enabled = False
ephemeral_disk_volume_type = CONST_DISK_TYPE_EPHEMERAL_VOLUME_ONLY
perf_tier = CONST_EPHEMERAL_NVME_PERF_TIER_STANDARD
resource_cpu_value = -1
except UnknownError as e:
logger.error(f"\nError fetching k8s extension module: {e}")
return False, False, False, False, False, -1, "", ""
except Exception as ex:
logger.error(f"\Exception occurred while fetching k8s extension module: {ex}")
return False, False, False, False, False, -1, "", ""

try:
extension = k8s_extension_custom_mod.show_k8s_extension(
Expand Down
38 changes: 23 additions & 15 deletions src/aks-preview/azext_aks_preview/managed_cluster_decorator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4045,21 +4045,29 @@ def update_azure_container_storage(self, mc: ManagedCluster) -> ManagedCluster:
pool_size = self.context.raw_param.get("storage_pool_size")
agentpool_details = {}
from azext_aks_preview.azurecontainerstorage._helpers import get_extension_installed_and_cluster_configs
(
is_extension_installed,
is_azureDisk_enabled,
is_elasticSan_enabled,
is_ephemeralDisk_localssd_enabled,
is_ephemeralDisk_nvme_enabled,
current_core_value,
existing_ephemeral_disk_volume_type,
existing_perf_tier,
) = get_extension_installed_and_cluster_configs(
self.cmd,
self.context.get_resource_group_name(),
self.context.get_name(),
mc.agent_pool_profiles,
)

try:
(
is_extension_installed,
is_azureDisk_enabled,
is_elasticSan_enabled,
is_ephemeralDisk_localssd_enabled,
is_ephemeralDisk_nvme_enabled,
current_core_value,
existing_ephemeral_disk_volume_type,
existing_perf_tier,
) = get_extension_installed_and_cluster_configs(
self.cmd,
self.context.get_resource_group_name(),
self.context.get_name(),
mc.agent_pool_profiles,
)
except UnknownError as e:
logger.error(f"\nError fetching installed extension and cluster config: {e}")
return mc
except Exception as ex:
logger.error(f"\Exception fetching installed extension and cluster config: {ex}")
return mc

vm_cache_generated = self.context.get_intermediate(
"vm_cache_generated",
Expand Down
Loading