Add Custom Delete Logic for Partners

src/k8s-extension/azext_k8s_extension/custom.py

@@ -195,6 +195,17 @@ def delete_k8s_extension(client, resource_group_name, cluster_name, name, cluste
     """
     # Determine ClusterRP
     cluster_rp = __get_cluster_rp(cluster_type)
+    extension = None
+    try:
+        extension = client.get(resource_group_name, cluster_rp, cluster_type, cluster_name, name)
+    except ErrorResponseException:
+        logger.warning("No extension with name '%s' found on cluster '%s', so nothing to delete", cluster_name, name)
+        return None
+    extension_class = ExtensionFactory(extension.extension_type.lower())
+
+    # If there is any custom delete logic, this will call the logic
+    extension_class.Delete(client, resource_group_name, cluster_name, name, cluster_type)
+
     return client.delete(resource_group_name, cluster_rp, cluster_type, cluster_name, name)
 
 

src/k8s-extension/azext_k8s_extension/partner_extensions/AzureDefender.py

@@ -70,3 +70,6 @@ def Update(self, extension, auto_upgrade_minor_version, release_train, version):
             release_train=release_train,
             version=version
         )
+
+    def Delete(self, client, resource_group_name, cluster_name, name, cluster_type):
+        pass

src/k8s-extension/azext_k8s_extension/partner_extensions/AzureMLKubernetes.py

@@ -162,6 +162,9 @@ def Update(self, extension, auto_upgrade_minor_version, release_train, version):
             version=version
         )
 
+    def Delete(self, client, resource_group_name, cluster_name, name, cluster_type):
+        pass
+
     def __validate_config(self, configuration_settings, configuration_protected_settings):
         # perform basic validation of the input config
         config_keys = configuration_settings.keys()
@@ -226,7 +229,7 @@ def __validate_scoring_fe_settings(self, configuration_settings, configuration_p
         if feIsNodePort and feIsInternalLoadBalancer:
             raise MutuallyExclusiveArgumentError(
                 "Specify either privateEndpointNodeport=true or privateEndpointILB=true, but not both.")
-        elif feIsNodePort:
+        if feIsNodePort:
             configuration_settings['scoringFe.serviceType.nodePort'] = feIsNodePort
         elif feIsInternalLoadBalancer:
             configuration_settings['scoringFe.serviceType.internalLoadBalancer'] = feIsInternalLoadBalancer

src/k8s-extension/azext_k8s_extension/partner_extensions/Cassandra.py

@@ -55,3 +55,6 @@ def Update(self, extension, auto_upgrade_minor_version, release_train, version):
             release_train=release_train,
             version=version
         )
+
+    def Delete(self, client, resource_group_name, cluster_name, name, cluster_type):
+        pass

src/k8s-extension/azext_k8s_extension/partner_extensions/ContainerInsights.py

@@ -82,6 +82,9 @@ def Update(self, extension, auto_upgrade_minor_version, release_train, version):
             version=version
         )
 
+    def Delete(self, client, resource_group_name, cluster_name, name, cluster_type):
+        pass
+
 
 # Custom Validation Logic for Container Insights
 

src/k8s-extension/azext_k8s_extension/partner_extensions/DefaultExtension.py

@@ -55,3 +55,6 @@ def Update(self, extension, auto_upgrade_minor_version, release_train, version):
             release_train=release_train,
             version=version
         )
+
+    def Delete(self, client, resource_group_name, cluster_name, name, cluster_type):
+        pass

src/k8s-extension/azext_k8s_extension/partner_extensions/OpenServiceMesh.py

@@ -4,6 +4,8 @@
 # --------------------------------------------------------------------------------------------
 
 # pylint: disable=unused-argument
+# pylint: disable=redefined-outer-name
+# pylint: disable=no-member
 
 from knack.log import get_logger
 
@@ -101,6 +103,9 @@ def Update(self, extension, auto_upgrade_minor_version, release_train, version):
             version=version
         )
 
+    def Delete(self, client, resource_group_name, cluster_name, name, cluster_type):
+        pass
+
 
 def _validate_tested_distro(cmd, cluster_resource_group_name, cluster_name, extension_version):
 

src/k8s-extension/azext_k8s_extension/partner_extensions/PartnerExtensionModel.py

@@ -21,3 +21,7 @@ def Create(self, cmd, client, resource_group_name: str, cluster_name: str, name:
     def Update(self, extension: ExtensionInstance, auto_upgrade_minor_version: bool,
                release_train: str, version: str) -> ExtensionInstanceUpdate:
         pass
+
+    @abstractmethod
+    def Delete(self, client, resource_group_name: str, cluster_name: str, name: str, cluster_type: str):
+        pass

src/k8s-extension/azext_k8s_extension/tests/latest/test_k8s_extension_scenario.py

@@ -6,25 +6,24 @@
 # pylint: disable=line-too-long
 
 import os
-from azure.cli.testsdk import (ScenarioTest, ResourceGroupPreparer, record_only)
+from azure.cli.testsdk import (ScenarioTest, record_only)
 
 
 TEST_DIR = os.path.abspath(os.path.join(os.path.abspath(__file__), '..'))
 
 
 class K8sExtensionScenarioTest(ScenarioTest):
     @record_only()
-    @ResourceGroupPreparer(name_prefix='cli_test_k8s_extension')
     def test_k8s_extension(self):
         resource_type = 'microsoft.openservicemesh'
         self.kwargs.update({
-            'name': 'openservice-mesh',
+            'name': 'openservicemesh',
             'rg': 'nanthirg0923',
             'cluster_name': 'nanthicluster0923',
             'cluster_type': 'connectedClusters',
             'extension_type': resource_type,
-            'release_train': 'staging',
-            'version': '0.1.0'
+            'release_train': 'pilot',
+            'version': '0.8.3'
         })
 
         self.cmd('k8s-extension create -g {rg} -n {name} -c {cluster_name} --cluster-type {cluster_type} '

src/k8s-extension/azext_k8s_extension/tests/latest/test_open_service_mesh.py

@@ -8,8 +8,8 @@
 import os
 import unittest
 
-from azext_k8s_extension.partner_extensions.OpenServiceMesh import _get_tested_distros
 from azure.cli.core.azclierror import InvalidArgumentValueError
+from azext_k8s_extension.partner_extensions.OpenServiceMesh import _get_tested_distros
 
 TEST_DIR = os.path.abspath(os.path.join(os.path.abspath(__file__), '..'))