Update object upon deletion

If an object is deleted and the API responds with a resource, update the
deleted object.

This causes the object to be updated with the deletion timestamp.

Signed-off-by: Kevin McDermott <[email protected]>

Author: bigkevmcd

pkg/client/client_test.go

@@ -51,6 +51,7 @@ import (
 	"sigs.k8s.io/controller-runtime/examples/crd/pkg"
 	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 )
 
 func deleteDeployment(ctx context.Context, dep *appsv1.Deployment, ns string) {
@@ -1733,6 +1734,7 @@ U5wwSivyi7vmegHKmblOzNVKA5qPO8zWzqBC
 				nodeName := node.Name
 				err = cl.Delete(ctx, node)
 				Expect(err).NotTo(HaveOccurred())
+				Expect(node.ObjectMeta.DeletionTimestamp).To(BeNil())
 
 				By("validating the Node no longer exists")
 				_, err = clientset.CoreV1().Nodes().Get(ctx, nodeName, metav1.GetOptions{})
@@ -1749,6 +1751,36 @@ U5wwSivyi7vmegHKmblOzNVKA5qPO8zWzqBC
 				Expect(err).To(HaveOccurred())
 			})
 
+			It("should update the resource when deleting if it receives a response", func() {
+				cl, err := client.New(cfg, client.Options{})
+				Expect(err).NotTo(HaveOccurred())
+				Expect(cl).NotTo(BeNil())
+
+				By("initially creating a Node")
+				node, err := clientset.CoreV1().Nodes().Create(ctx, node, metav1.CreateOptions{})
+				Expect(err).NotTo(HaveOccurred())
+
+				By("adding a finalizer we prevent the node from being deleted immediately")
+				controllerutil.AddFinalizer(node, "example.com/test")
+				node, err = clientset.CoreV1().Nodes().Update(ctx, node, metav1.UpdateOptions{})
+				Expect(err).NotTo(HaveOccurred())
+
+				By("deleting the Node")
+				nodeName := node.Name
+				err = cl.Delete(context.TODO(), node)
+				Expect(err).NotTo(HaveOccurred())
+				Expect(node.ObjectMeta.DeletionTimestamp).NotTo(BeNil())
+
+				By("removing the finalizer")
+				controllerutil.RemoveFinalizer(node, "example.com/test")
+				_, err = clientset.CoreV1().Nodes().Update(ctx, node, metav1.UpdateOptions{})
+				Expect(err).NotTo(HaveOccurred())
+
+				By("validating the Node no longer exists")
+				_, err = clientset.CoreV1().Nodes().Get(ctx, nodeName, metav1.GetOptions{})
+				Expect(err).To(HaveOccurred())
+			})
+
 			PIt("should fail if the object doesn't have meta", func() {
 
 			})

pkg/client/dryrun_test.go

@@ -179,8 +179,9 @@ var _ = Describe("DryRunClient", func() {
 		Expect(actual).To(BeEquivalentTo(dep))
 	})
 
-	It("should not delete objects", func(ctx SpecContext) {
-		Expect(getClient().Delete(ctx, dep)).NotTo(HaveOccurred())
+	It("should not delete objects", func() {
+		changedDep := dep.DeepCopy()
+		Expect(getClient().Delete(ctx, changedDep)).NotTo(HaveOccurred())
 
 		actual, err := clientset.AppsV1().Deployments(ns).Get(ctx, dep.Name, metav1.GetOptions{})
 		Expect(err).NotTo(HaveOccurred())
@@ -191,7 +192,8 @@ var _ = Describe("DryRunClient", func() {
 	It("should not delete objects with opts", func(ctx SpecContext) {
 		opts := &client.DeleteOptions{DryRun: []string{"Bye", "Pippa"}}
 
-		Expect(getClient().Delete(ctx, dep, opts)).NotTo(HaveOccurred())
+		changedDep := dep.DeepCopy()
+		Expect(getClient().Delete(ctx, changedDep, opts)).NotTo(HaveOccurred())
 
 		actual, err := clientset.AppsV1().Deployments(ns).Get(ctx, dep.Name, metav1.GetOptions{})
 		Expect(err).NotTo(HaveOccurred())

pkg/client/typed_client.go

@@ -87,7 +87,7 @@ func (c *typedClient) Delete(ctx context.Context, obj Object, opts ...DeleteOpti
 		Name(o.name).
 		Body(deleteOpts.AsDeleteOptions()).
 		Do(ctx).
-		Error()
+		Into(obj)
 }
 
 // DeleteAllOf implements client.Client.