Check the installed bundle extensions through the extension configs.

Author: SherryPuffs

src/connectedk8s/azext_connectedk8s/_constants.py

@@ -134,6 +134,7 @@
 Get_HelmRegistery_Path_Fault_Type = "helm-registry-path-fetch-error"
 Pull_HelmChart_Fault_Type = "helm-chart-pull-error"
 Export_HelmChart_Fault_Type = "helm-chart-export-error"
+List_Extension_Config_Fault_Type = "kubernetes-list-extension-config-error"
 List_Kubernetes_Namespaced_Pod_Fault_Type = "kubernetes-list-namespaced-pod-error"
 Get_Kubernetes_Distro_Fault_Type = "kubernetes-get-distribution-error"
 Get_Kubernetes_Namespace_Fault_Type = "kubernetes-get-namespace-error"
@@ -526,16 +527,12 @@
 Arc_Agentry_Bundle_Feature_Setting = "versionManagedExtensions"
 
 Bundle_Feature_Value_List = ["enabled", "disabled", "preview"]
-Bundle_Extension_Type_List = [
-    "microsoft.iotoperations",
-    "microsoft.extensiondiagnostics",
-    "microsoft.arc.containerstorage",
-    "microsoft.azure.secretstore",
-]
 
-CONST_K8S_EXTENSION_NAME = "k8s-extension"
-CONST_K8S_EXTENSION_CLIENT_FACTORY_MOD_NAME = "azext_k8s_extension._client_factory"
-CONST_K8S_EXTENSION_CUSTOM_MOD_NAME = "azext_k8s_extension.custom"
+Extension_Config_CRD_Group = "clusterconfig.azure.com"
+Extension_Config_CRD_Version = "v1beta1"
+Extension_Config_CRD_Plural = "extensionconfigs"
 
-List_K8s_Extension_Fault_Type = "list-k8s-extension-error"
 Get_Bundle_Feature_Flag_Fault_Type = "get-bundle-feature-flag-error"
+Get_Extension_Config_Bundle_Property_Fault_Type = (
+    "get-extension-config-bundle-property-error"
+)

src/connectedk8s/azext_connectedk8s/_help.py

@@ -38,10 +38,6 @@
       text: az connectedk8s connect -g resourceGroupName -n connectedClusterName --enable-oidc-issuer --self-hosted-issuer aksissuerurl
     - name: Onboard a connected kubernetes cluster with azure gateway feature enabled.
       text: az connectedk8s connect -g resourceGroupName -n connectedClusterName --gateway-resource-id gatewayResourceId
-    - name: Onboard a connected kubernetes cluster with the bundling feature enabled.
-      text: az connectedk8s connect -g resourceGroupName -n connectedClusterName --disable-auto-upgrade --config extensionSets.versionManagedExtensions='enabled'
-    - name: Onboard a connected Kubernetes cluster with the bundling feature in preview mode.
-      text: az connectedk8s connect -g resourceGroupName -n connectedClusterName --disable-auto-upgrade --config extensionSets.versionManagedExtensions='preview'
 
 """
 
@@ -65,11 +61,6 @@
       text: az connectedk8s update -g resourceGroupName -n connectedClusterName --gateway-resource-id gatewayResourceId
     - name: Disable the azure gateway feature on a connected kubernetes cluster.
       text: az connectedk8s update -g resourceGroupName -n connectedClusterName --disable-gateway
-    - name: Enable the bundling feature on a connected kubernetes cluster.
-      text: az connectedk8s update -g resourceGroupName -n connectedClusterName --auto-upgrade false --config extensionSets.versionManagedExtensions='enabled'
-    - name: Disable the bundling feature on a connected kubernetes cluster.
-      text: az connectedk8s update -g resourceGroupName -n connectedClusterName --auto-upgrade false --config extensionSets.versionManagedExtensions='disabled'
-
 """
 
 helps["connectedk8s upgrade"] = """

src/connectedk8s/azext_connectedk8s/custom.py

@@ -48,6 +48,7 @@
 from knack.prompting import NoTTYException, prompt_y_n
 from kubernetes import client as kube_client
 from kubernetes import config
+from kubernetes.client.rest import ApiException
 from kubernetes.config.kube_config import KubeConfigMerger
 from packaging import version
 
@@ -1538,22 +1539,48 @@ def set_security_profile(enable_workload_identity: bool) -> SecurityProfile:
     return security_profile
 
 
-def get_k8s_extension_module(module_name):
+def get_installed_bundle_extensions() -> list[str]:
+    api_instance = kube_client.CustomObjectsApi()
+
     try:
-        # adding the installed extension in the path
-        from azure.cli.core.extension.operations import add_extension_to_path
+        extension_configs = api_instance.list_cluster_custom_object(
+            group=consts.Extension_Config_CRD_Group,
+            version=consts.Extension_Config_CRD_Version,
+            plural=consts.Extension_Config_CRD_Plural,
+        )
+    except Exception as e:
+        if isinstance(e, ApiException) and e.status == 404:
+            # If the ExtensionConfig resource is not found, return an empty list
+            return []
+
+        utils.kubernetes_exception_handler(
+            e,
+            consts.List_Extension_Config_Fault_Type,
+            "Failed to list ExtensionConfigs",
+            error_message="Failed to list ExtensionConfigs: ",
+        )
 
-        add_extension_to_path(consts.CONST_K8S_EXTENSION_NAME)
-        # import the extension module
-        from importlib import import_module
+    try:
+        installed_extensions = []
+        for config in extension_configs.get("items", []):
+            config_spec = config.get("spec", {})
+            isPartOfBundle = config_spec.get("isPartOfBundle")
+            isDependentOnBundle = config_spec.get("isDependentOnBundle")
+            extensionType = config_spec.get("extensionType")
+            if (isPartOfBundle or isDependentOnBundle) and extensionType:
+                installed_extensions.append(extensionType)
 
-        azext_custom = import_module(module_name)
-        return azext_custom
-    except ImportError:
-        raise ImportError(  # pylint: disable=raise-missing-from
-            "Please add CLI extension `k8s-extension` to disable bundle feature flag.\n"
-            "Run command `az extension add --name k8s-extension`"
+    except Exception as e:  # pylint: disable=broad-except
+        telemetry.set_exception(
+            exception=e,
+            fault_type=consts.Get_Extension_Config_Bundle_Property_Fault_Type,
+            summary="Failed to get bundle properties from the Arc extension config",
         )
+        raise CLIInternalError(
+            f"Failed to get bundle properties from the Arc extension config: {e}"
+        )
+
+    return installed_extensions
 
 
 def get_bundle_feature_flag_from_arc_agentry_config(
@@ -1755,34 +1782,7 @@ def validate_update_cluster_bundle_feature_flag_value(
         current_bundle_feature_flag_value == "enabled"
         and bundle_feature_flag_value == "disabled"
     ):
-        client_factory = get_k8s_extension_module(
-            consts.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(
-            consts.CONST_K8S_EXTENSION_CUSTOM_MOD_NAME
-        )
-
-        try:
-            extensions = k8s_extension_custom_mod.list_k8s_extension(
-                client,
-                resource_group_name,
-                cluster_name,
-                consts.Connected_Cluster_Type,
-            )
-
-        except Exception as e:  # pylint: disable=broad-except
-            utils.arm_exception_handler(
-                e,
-                consts.List_K8s_Extension_Fault_Type,
-                "Failed to list installed k8s extensions for the connected cluster.",
-            )
-
-        installed_bundle_extensions = [
-            ext.extension_type.lower()
-            for ext in extensions
-            if ext.extension_type.lower() in consts.Bundle_Extension_Type_List
-        ]
+        installed_bundle_extensions = get_installed_bundle_extensions()
 
         if installed_bundle_extensions:
             err_msg = (
@@ -2395,19 +2395,6 @@ def update_connected_cluster(
         )
         raise InvalidArgumentValueError(err_msg)
 
-    # Validate and update bundle feature flag value if provided
-    validate_update_cluster_bundle_feature_flag_value(
-        cmd,
-        connected_cluster.arc_agentry_configurations,
-        configuration_settings,
-        resource_group_name,
-        cluster_name,
-    )
-
-    arc_agentry_configurations = generate_arc_agent_configuration(
-        configuration_settings, redacted_protected_values
-    )
-
     # Patching the connected cluster ARM resource
     arm_properties_unset = (
         tags is None
@@ -2476,6 +2463,19 @@ def update_connected_cluster(
     # if the user had not logged in.
     kubernetes_version = check_kube_connection()
 
+    # Validate and update bundle feature flag value if provided
+    validate_update_cluster_bundle_feature_flag_value(
+        cmd,
+        connected_cluster.arc_agentry_configurations,
+        configuration_settings,
+        resource_group_name,
+        cluster_name,
+    )
+
+    arc_agentry_configurations = generate_arc_agent_configuration(
+        configuration_settings, redacted_protected_values
+    )
+
     # Install helm client
     helm_client_location = install_helm_client(cmd)
 
@@ -2999,7 +2999,7 @@ def upgrade_agents(
                 e,
                 consts.List_Kubernetes_Namespaced_Pod_Fault_Type,
                 "Unable to list pods",
-                error_message=f"Unable to list pods in namespace '{namespace}' with label selector '{label_selector}'",
+                error_message=f"Unable to list pods in namespace '{namespace}' with label selector '{label_selector}': ",
                 raise_error=False,
             )