Resolve DynamicClient delete function only takes the resource name

Author: kocarba

kubernetes/e2e_test/test_utils.py

@@ -883,6 +883,39 @@ def test_delete_from_list_in_multi_resource_yaml(self):
         self.assertFalse(pod1_status)
         self.assertFalse(deploy_status)
 
+    def test_delete_apps_deployment_from_yaml_with_apply(self):
+        """
+        Should be able to create and delete an apps/v1 deployment using apply.
+        """
+        k8s_client = client.api_client.ApiClient(configuration=self.config)
+        # Create the deployment
+        utils.process_from_yaml(
+            k8s_client, self.path_prefix + "apps-deployment.yaml", apply=True)
+        app_api = client.AppsV1Api(k8s_client)
+        dep = app_api.read_namespaced_deployment(name="nginx-app",
+                                                    namespace="default")
+        self.assertIsNotNone(dep)
+        self.assertEqual("nginx-app", dep.metadata.name)
+        self.assertEqual(
+            "nginx:1.15.4", dep.spec.template.spec.containers[0].image)
+        self.assertEqual(
+            80, dep.spec.template.spec.containers[0].ports[0].container_port)
+        self.assertEqual(
+            "nginx", dep.spec.template.spec.containers[0].name)
+        self.assertEqual("nginx", dep.spec.template.metadata.labels["app"])
+        self.assertEqual(3, dep.spec.replicas)
+
+        # Delete the deployment using apply
+        utils.process_from_yaml(
+            k8s_client, self.path_prefix + "apps-deployment.yaml", apply=True, action="delete")
+        time.sleep(10)  # Wait for the deletion to propagate
+
+        # Verify the deployment is deleted
+        with self.assertRaises(ApiException) as cm:
+            app_api.read_namespaced_deployment(name="nginx-app",
+                                                namespace="default")
+        self.assertEqual(cm.exception.status, 404)
+
 
 class TestUtilsUnitTests(unittest.TestCase):
 

kubernetes/utils/yaml_processor.py

@@ -280,8 +280,9 @@ def process_from_yaml_single_item(
                 body=yml_object, field_manager="python-client", **kwargs
             )
         elif action == "delete":
+            name = yml_object["metadata"]["name"]
             resp = apply_client.delete(
-                body=yml_object, field_manager="python-client", **kwargs
+                name=name, **kwargs
             )
         if verbose:
             msg = "{0} {1}d.".format(kind, action)
@@ -483,8 +484,9 @@ def create_from_dict(k8s_client, data, verbose=False, namespace='default',
     """
     return process_from_dict(k8s_client, data, verbose, namespace, action="create", **kwargs)
 
+
 class FailToCreateError(FailToProcessError):
     """
     An exception class for handling error if an error occurred when
     handling a yaml file.
-    """
+    """