Merge pull request Azure#8 from bavneetsingh16/deesharma/providerregistration

Author: bavneetsingh16

src/connectedk8s/azext_connectedk8s/_constants.py

@@ -158,6 +158,8 @@
 Proxy_Kubeconfig_During_Deletion_Fault_Type = 'Encountered proxy kubeconfig during deletion.'
 Cannot_Create_ClusterRoleBindings_Fault_Type = 'Cannot create cluster role bindings on this Kubernets cluster'
 CC_Provider_Namespace_Not_Registered_Fault_Type = "Connected Cluster Provider MS.K8 namespace not registered"
+Kubernetes_Configuration_Provider_Namespace_Not_Registered_Fault_Type = \
+    "Kubernetes Configuration Provider MS.KubernetesConfiguration namespace not registered"
 HC_Provider_Namespace_Not_Registered_Fault_Type = "Hybrid Compute Provider MS.HybridCompute namespace not registered"
 Default_Namespace_Does_Not_Exist_Fault_Type = \
     "The default namespace defined in the kubeconfig doesn't exist on the kubernetes cluster."

src/connectedk8s/azext_connectedk8s/_utils.py

@@ -984,7 +984,7 @@ def names(self, names):
         logger.debug("Error while trying to monkey patch the fix for list_node(): {}".format(str(ex)))
 
 
-def check_provider_registrations(cli_ctx, subscription_id, is_gateway_enabled):
+def check_provider_registrations(cli_ctx, subscription_id, is_gateway_enabled, is_workload_identity_enabled):
     print("Step: {}: Checking Provider Registrations".format(get_utctimestring()))
     try:
         rp_client = resource_providers_client(cli_ctx, subscription_id)
@@ -999,6 +999,15 @@ def check_provider_registrations(cli_ctx, subscription_id, is_gateway_enabled):
             raise ValidationError(err_msg)
         kc_registration_state = rp_client.get(consts.Kubernetes_Configuration_Provider_Namespace).registration_state
         if kc_registration_state != "Registered":
+            if is_workload_identity_enabled:
+                telemetry.set_exception(
+                    exception="{} provider is not registered".format(consts.Kubernetes_Configuration_Provider_Namespace),
+                    fault_type=consts.Kubernetes_Configuration_Provider_Namespace_Not_Registered_Fault_Type,
+                    summary="{} provider is not registered".format(consts.Kubernetes_Configuration_Provider_Namespace))
+                err_msg = "{} provider is not registered. Please register it using 'az provider register -n 'Microsoft." \
+                    "KubernetesConfiguration' before running the connect command.".format(consts.Kubernetes_Configuration_Provider_Namespace)
+                raise ValidationError(err_msg)
+            
             telemetry.set_user_fault()
             logger.warning("{} provider is not registered".format(consts.Kubernetes_Configuration_Provider_Namespace))
         if is_gateway_enabled:

src/connectedk8s/azext_connectedk8s/custom.py

@@ -116,7 +116,8 @@ def create_connectedk8s(cmd, client, resource_group_name, cluster_name, correlat
     azure_cloud = send_cloud_telemetry(cmd)
 
     # Checking provider registration status
-    utils.check_provider_registrations(cmd.cli_ctx, subscription_id, is_gateway_enabled=bool(gateway_resource_id))
+    utils.check_provider_registrations(cmd.cli_ctx, subscription_id, is_gateway_enabled=bool(gateway_resource_id), 
+                                        is_workload_identity_enabled=(enable_workload_identity or enable_oidc_issuer))
 
     # Setting kubeconfig
     kube_config = set_kube_config(kube_config)