Proxy test + bug fix diagnoser +force del +arm id

src/connectedk8s/HISTORY.rst

@@ -2,6 +2,13 @@
 
 Release History
 ===============
+1.3.16
+++++++
+* Adding force delete in connect command in case of stale resources present during onboarding
+* Bug fixes in diagnoser
+* Pushing armd id and location to telemetry
+* Adding test for connectedk8s proxy command
+
 1.3.15
 ++++++
 

src/connectedk8s/azext_connectedk8s/_troubleshootutils.py

@@ -89,6 +89,18 @@ def fetch_connected_cluster_resource(filepath_with_timestamp, connected_cluster,
         connected_cluster.last_connectivity_time = last_connectivity_time_str
         managed_identity_certificate_expiration_time_str = str(connected_cluster.managed_identity_certificate_expiration_time)
         connected_cluster.managed_identity_certificate_expiration_time = managed_identity_certificate_expiration_time_str
+
+        # Formatting system_data
+        created_at = str(connected_cluster.system_data.created_at)
+        connected_cluster.system_data.created_at = created_at
+        last_modified_at = str(connected_cluster.system_data.last_modified_at)
+        connected_cluster.system_data.last_modified_at = last_modified_at
+        system_data = str(connected_cluster.system_data)
+        connected_cluster.system_data = system_data
+        # Formatting identity
+        identity = str(connected_cluster.identity)
+        connected_cluster.identity = identity
+
         if storage_space_available:
             # If storage space is available then only store the connected cluster resource
             with open(connected_cluster_resource_file_path, 'w+') as cc:

src/connectedk8s/azext_connectedk8s/custom.py

@@ -240,6 +240,9 @@ def create_connectedk8s(cmd, client, resource_group_name, cluster_name, correlat
     }
     telemetry.add_extension_event('connectedk8s', kubernetes_properties)
 
+    resource_id = f'/subscriptions/{subscription_id}/resourcegroups/{resource_group_name}/providers/Microsoft.Kubernetes/connectedClusters/{cluster_name}/location/{location}'
+    telemetry.add_extension_event('connectedk8s', {'Context.Default.AzureCLI.resourceid': resource_id})
+
     # Checking if it is an AKS cluster
     is_aks_cluster = check_aks_cluster(kube_config, kube_context)
     if is_aks_cluster:
@@ -310,8 +313,11 @@ def create_connectedk8s(cmd, client, resource_group_name, cluster_name, correlat
                                          "is already onboarded to the resource group" +
                                          " '{}' with resource name '{}'.".format(configmap_rg_name, configmap_cluster_name))
         else:
-            # Cleanup agents and continue with put
-            utils.delete_arc_agents(release_namespace, kube_config, kube_context, helm_client_location, is_arm64_cluster)
+            logger.warning("Cleaning up the stale arc agents present on the cluster before starting new onboarding.")
+            # Explicit CRD Deletion
+            crd_cleanup_force_delete(kubectl_client_location, kube_config, kube_context)
+            # Cleaning up the cluster
+            utils.delete_arc_agents(release_namespace, kube_config, kube_context, helm_client_location, is_arm64_cluster, True)
 
     else:
         if connected_cluster_exists(client, resource_group_name, cluster_name):
@@ -824,48 +830,7 @@ def delete_connectedk8s(cmd, client, resource_group_name, cluster_name,
         delete_cc_resource(client, resource_group_name, cluster_name, no_wait).result()
 
         # Explicit CRD Deletion
-
-        timeout_for_crd_deletion = "20s"
-        for crds in consts.CRD_FOR_FORCE_DELETE:
-            cmd_helm_delete = [kubectl_client_location, "delete", "crds", crds, "--ignore-not-found", "--wait", "--timeout", "{}".format(timeout_for_crd_deletion)]
-            if kube_config:
-                cmd_helm_delete.extend(["--kubeconfig", kube_config])
-            if kube_context:
-                cmd_helm_delete.extend(["--context", kube_context])
-            response_helm_delete = Popen(cmd_helm_delete, stdout=PIPE, stderr=PIPE)
-            _, error_helm_delete = response_helm_delete.communicate()
-
-        # Timer added to have sufficient time after CRD deletion
-        # to check the status of the CRD ( deleted or terminating )
-        time.sleep(3)
-
-        # patching yaml file path for removing CRD finalizer
-        current_path = os.path.abspath(os.path.dirname(__file__))
-        yaml_file_path = os.path.join(current_path, "remove_crd_finalizer.yaml")
-
-        # Patch if CRD is in Terminating state
-        for crds in consts.CRD_FOR_FORCE_DELETE:
-
-            cmd = [kubectl_client_location, "get", "crd", crds, "-ojson"]
-            if kube_config:
-                cmd.extend(["--kubeconfig", kube_config])
-            if kube_context:
-                cmd.extend(["--context", kube_context])
-            cmd_output = Popen(cmd, stdout=PIPE, stderr=PIPE)
-            _, error_helm_delete = cmd_output.communicate()
-
-            if(cmd_output.returncode == 0):
-                changed_cmd = json.loads(cmd_output.communicate()[0].strip())
-                status = changed_cmd['status']['conditions'][-1]['type']
-
-                if(status == "Terminating"):
-                    patch_cmd = [kubectl_client_location, "patch", "crd", crds, "--type=merge", "--patch-file", yaml_file_path]
-                    if kube_config:
-                        patch_cmd.extend(["--kubeconfig", kube_config])
-                    if kube_context:
-                        patch_cmd.extend(["--context", kube_context])
-                    output_patch_cmd = Popen(patch_cmd, stdout=PIPE, stderr=PIPE)
-                    _, error_helm_delete = output_patch_cmd.communicate()
+        crd_cleanup_force_delete(kubectl_client_location, kube_config, kube_context)
 
         if(release_namespace):
             utils.delete_arc_agents(release_namespace, kube_config, kube_context, helm_client_location, is_arm64_cluster, True)
@@ -2364,8 +2329,9 @@ def troubleshoot(cmd, client, resource_group_name, cluster_name, kube_config=Non
         # saving metadata CR sanpshot
         storage_space_available = troubleshootutils.get_metadata_cr_snapshot(corev1_api_instance, kubectl_client_location, kube_config, kube_context, filepath_with_timestamp, storage_space_available)
 
-        # saving kube-aad-proxy CR snapshot
-        storage_space_available = troubleshootutils.get_kubeaadproxy_cr_snapshot(corev1_api_instance, kubectl_client_location, kube_config, kube_context, filepath_with_timestamp, storage_space_available)
+        # saving kube-aad-proxy CR snapshot only in the case private link is disabled
+        if connected_cluster.private_link_state == "Disabled":
+            storage_space_available = troubleshootutils.get_kubeaadproxy_cr_snapshot(corev1_api_instance, kubectl_client_location, kube_config, kube_context, filepath_with_timestamp, storage_space_available)
 
         # checking cluster connectivity status
         cluster_connectivity_status = connected_cluster.connectivity_status
@@ -2436,3 +2402,48 @@ def install_kubectl_client():
     except Exception as e:
         telemetry.set_exception(exception=e, fault_type=consts.Download_And_Install_Kubectl_Fault_Type, summary="Failed to download and install kubectl")
         raise CLIInternalError("Unable to install kubectl. Error: ", str(e))
+
+
+def crd_cleanup_force_delete(kubectl_client_location, kube_config, kube_context):
+
+        timeout_for_crd_deletion = "20s"
+        for crds in consts.CRD_FOR_FORCE_DELETE:
+            cmd_helm_delete = [kubectl_client_location, "delete", "crds", crds, "--ignore-not-found", "--wait", "--timeout", "{}".format(timeout_for_crd_deletion)]
+            if kube_config:
+                cmd_helm_delete.extend(["--kubeconfig", kube_config])
+            if kube_context:
+                cmd_helm_delete.extend(["--context", kube_context])
+            response_helm_delete = Popen(cmd_helm_delete, stdout=PIPE, stderr=PIPE)
+            _, error_helm_delete = response_helm_delete.communicate()
+
+        # Timer added to have sufficient time after CRD deletion
+        # to check the status of the CRD ( deleted or terminating )
+        time.sleep(3)
+
+        # patching yaml file path for removing CRD finalizer
+        current_path = os.path.abspath(os.path.dirname(__file__))
+        yaml_file_path = os.path.join(current_path, "remove_crd_finalizer.yaml")
+
+        # Patch if CRD is in Terminating state
+        for crds in consts.CRD_FOR_FORCE_DELETE:
+
+            cmd = [kubectl_client_location, "get", "crd", crds, "-ojson"]
+            if kube_config:
+                cmd.extend(["--kubeconfig", kube_config])
+            if kube_context:
+                cmd.extend(["--context", kube_context])
+            cmd_output = Popen(cmd, stdout=PIPE, stderr=PIPE)
+            _, error_helm_delete = cmd_output.communicate()
+
+            if(cmd_output.returncode == 0):
+                changed_cmd = json.loads(cmd_output.communicate()[0].strip())
+                status = changed_cmd['status']['conditions'][-1]['type']
+
+                if(status == "Terminating"):
+                    patch_cmd = [kubectl_client_location, "patch", "crd", crds, "--type=merge", "--patch-file", yaml_file_path]
+                    if kube_config:
+                        patch_cmd.extend(["--kubeconfig", kube_config])
+                    if kube_context:
+                        patch_cmd.extend(["--context", kube_context])
+                    output_patch_cmd = Popen(patch_cmd, stdout=PIPE, stderr=PIPE)
+                    _, error_helm_delete = output_patch_cmd.communicate()

src/connectedk8s/azext_connectedk8s/tests/latest/test_connectedk8s_scenario.py

@@ -13,6 +13,7 @@
 import azext_connectedk8s._constants as consts
 import urllib.request
 import shutil
+import time
 from knack.log import get_logger
 from azure.cli.core import get_default_cli
 import subprocess
@@ -514,3 +515,49 @@ def test_troubleshoot(self,resource_group):
         # delete the kube config
         os.remove("%s" % (_get_test_data_file(managed_cluster_name + '-config.yaml')))
 
+    @live_only()
+    @ResourceGroupPreparer(name_prefix='conk8stest', location='eastus2euap', random_name_length=16)
+    def test_proxy(self,resource_group):
+        managed_cluster_name = self.create_random_name(prefix='test-proxy', length=24)
+        kubeconfig="%s" % (_get_test_data_file(managed_cluster_name + '-config.yaml'))
+        kubeconfig2="%s" % (_get_test_data_file(managed_cluster_name + '-config2.yaml'))
+        name = self.create_random_name(prefix='cc-', length=12)
+        self.kwargs.update({
+            'name': name,
+            'kubeconfig': kubeconfig,
+            'kubeconfig2': kubeconfig2,
+            'rg':resource_group,
+            'managed_cluster_name': managed_cluster_name
+        })
+
+        self.cmd('aks create -g {rg} -n {managed_cluster_name} --generate-ssh-keys')
+        self.cmd('aks get-credentials -g {rg} -n {managed_cluster_name} -f {kubeconfig} --admin')
+        self.cmd('connectedk8s connect -g {rg} -n {name} -l eastus --tags foo=doo --kube-config {kubeconfig} --kube-context {managed_cluster_name}-admin', checks=[
+            self.check('tags.foo', 'doo'),
+            self.check('name', '{name}')
+        ])
+        self.cmd('connectedk8s show -g {rg} -n {name}', checks=[
+            self.check('name', '{name}'),
+            self.check('resourceGroup', '{rg}'),
+            self.check('tags.foo', 'doo')
+        ])
+        # starting the proxy
+        script = ['az','connectedk8s', 'proxy', '-n', name, '-g', resource_group, '-f' , kubeconfig2, '&']
+        process = subprocess.Popen(script, shell=True)
+
+        # Time to let the kubeconfig merge in current context
+        time.sleep(10)
+
+        # Start running proxy as a background process
+        process2 = subprocess.Popen(['disown %1'],shell=True)
+
+        # testing if the proxy kubeconfig file is created
+        process3 = ['sudo', 'cat', kubeconfig2]
+        process3 = subprocess.run(process3,shell=True)
+
+        # Cleaning up the cluster
+        self.cmd('connectedk8s delete -g {rg} -n {name} --kube-config {kubeconfig} --kube-context {managed_cluster_name}-admin -y')
+        self.cmd('aks delete -g {rg} -n {managed_cluster_name} -y')
+
+        # delete the kube config
+        os.remove("%s" % (_get_test_data_file(managed_cluster_name + '-config.yaml')))

src/connectedk8s/setup.py

@@ -17,7 +17,7 @@
 # TODO: Confirm this is the right version number you want and it matches your
 # HISTORY.rst entry.
 
-VERSION = '1.3.15'
+VERSION = '1.3.16'
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers