Skip to content

Commit 4c1ed9f

Browse files
fix: catch and surface a concise err for acstor extension import error (#8518)
1 parent feda1a4 commit 4c1ed9f

2 files changed

Lines changed: 42 additions & 26 deletions

File tree

src/aks-preview/azext_aks_preview/azurecontainerstorage/_helpers.py

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -152,17 +152,25 @@ def get_extension_installed_and_cluster_configs(
152152
cluster_name,
153153
agentpool_profiles
154154
) -> Tuple[bool, bool, bool, bool, bool, float, str, str]:
155-
client_factory = get_k8s_extension_module(CONST_K8S_EXTENSION_CLIENT_FACTORY_MOD_NAME)
156-
client = client_factory.cf_k8s_extension_operation(cmd.cli_ctx)
157-
k8s_extension_custom_mod = get_k8s_extension_module(CONST_K8S_EXTENSION_CUSTOM_MOD_NAME)
158-
is_extension_installed = False
159-
is_elasticSan_enabled = False
160-
is_azureDisk_enabled = False
161-
is_ephemeralDisk_nvme_enabled = False
162-
is_ephemeralDisk_localssd_enabled = False
163-
ephemeral_disk_volume_type = CONST_DISK_TYPE_EPHEMERAL_VOLUME_ONLY
164-
perf_tier = CONST_EPHEMERAL_NVME_PERF_TIER_STANDARD
165-
resource_cpu_value = -1
155+
156+
try:
157+
client_factory = get_k8s_extension_module(CONST_K8S_EXTENSION_CLIENT_FACTORY_MOD_NAME)
158+
client = client_factory.cf_k8s_extension_operation(cmd.cli_ctx)
159+
k8s_extension_custom_mod = get_k8s_extension_module(CONST_K8S_EXTENSION_CUSTOM_MOD_NAME)
160+
is_extension_installed = False
161+
is_elasticSan_enabled = False
162+
is_azureDisk_enabled = False
163+
is_ephemeralDisk_nvme_enabled = False
164+
is_ephemeralDisk_localssd_enabled = False
165+
ephemeral_disk_volume_type = CONST_DISK_TYPE_EPHEMERAL_VOLUME_ONLY
166+
perf_tier = CONST_EPHEMERAL_NVME_PERF_TIER_STANDARD
167+
resource_cpu_value = -1
168+
except UnknownError as e:
169+
logger.error(f"\nError fetching k8s extension module: {e}")
170+
return False, False, False, False, False, -1, "", ""
171+
except Exception as ex:
172+
logger.error(f"\Exception occurred while fetching k8s extension module: {ex}")
173+
return False, False, False, False, False, -1, "", ""
166174

167175
try:
168176
extension = k8s_extension_custom_mod.show_k8s_extension(

src/aks-preview/azext_aks_preview/managed_cluster_decorator.py

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4045,21 +4045,29 @@ def update_azure_container_storage(self, mc: ManagedCluster) -> ManagedCluster:
40454045
pool_size = self.context.raw_param.get("storage_pool_size")
40464046
agentpool_details = {}
40474047
from azext_aks_preview.azurecontainerstorage._helpers import get_extension_installed_and_cluster_configs
4048-
(
4049-
is_extension_installed,
4050-
is_azureDisk_enabled,
4051-
is_elasticSan_enabled,
4052-
is_ephemeralDisk_localssd_enabled,
4053-
is_ephemeralDisk_nvme_enabled,
4054-
current_core_value,
4055-
existing_ephemeral_disk_volume_type,
4056-
existing_perf_tier,
4057-
) = get_extension_installed_and_cluster_configs(
4058-
self.cmd,
4059-
self.context.get_resource_group_name(),
4060-
self.context.get_name(),
4061-
mc.agent_pool_profiles,
4062-
)
4048+
4049+
try:
4050+
(
4051+
is_extension_installed,
4052+
is_azureDisk_enabled,
4053+
is_elasticSan_enabled,
4054+
is_ephemeralDisk_localssd_enabled,
4055+
is_ephemeralDisk_nvme_enabled,
4056+
current_core_value,
4057+
existing_ephemeral_disk_volume_type,
4058+
existing_perf_tier,
4059+
) = get_extension_installed_and_cluster_configs(
4060+
self.cmd,
4061+
self.context.get_resource_group_name(),
4062+
self.context.get_name(),
4063+
mc.agent_pool_profiles,
4064+
)
4065+
except UnknownError as e:
4066+
logger.error(f"\nError fetching installed extension and cluster config: {e}")
4067+
return mc
4068+
except Exception as ex:
4069+
logger.error(f"\Exception fetching installed extension and cluster config: {ex}")
4070+
return mc
40634071

40644072
vm_cache_generated = self.context.get_intermediate(
40654073
"vm_cache_generated",

0 commit comments

Comments
 (0)