Handle finalizers when deleting collections

Author: tjamet

pkg/client/fake/client.go

@@ -392,20 +392,7 @@ func (c *fakeClient) Delete(ctx context.Context, obj client.Object, opts ...clie
 	delOptions := client.DeleteOptions{}
 	delOptions.ApplyOptions(opts)
 
-	old, err := c.tracker.Get(gvr, accessor.GetNamespace(), accessor.GetName())
-	if err == nil {
-		oldAccessor, err := meta.Accessor(old)
-		if err == nil {
-			if len(oldAccessor.GetFinalizers()) > 0 {
-				now := metav1.Now()
-				oldAccessor.SetDeletionTimestamp(&now)
-				return c.tracker.Update(gvr, old, accessor.GetNamespace())
-			}
-		}
-	}
-
-	//TODO: implement propagation
-	return c.tracker.Delete(gvr, accessor.GetNamespace(), accessor.GetName())
+	return c.deleteObject(gvr, accessor)
 }
 
 func (c *fakeClient) DeleteAllOf(ctx context.Context, obj client.Object, opts ...client.DeleteAllOfOption) error {
@@ -436,7 +423,7 @@ func (c *fakeClient) DeleteAllOf(ctx context.Context, obj client.Object, opts ..
 		if err != nil {
 			return err
 		}
-		err = c.tracker.Delete(gvr, accessor.GetNamespace(), accessor.GetName())
+		err = c.deleteObject(gvr, accessor)
 		if err != nil {
 			return err
 		}
@@ -521,6 +508,23 @@ func (c *fakeClient) Status() client.StatusWriter {
 	return &fakeStatusWriter{client: c}
 }
 
+func (c *fakeClient) deleteObject(gvr schema.GroupVersionResource, accessor metav1.Object) error {
+	old, err := c.tracker.Get(gvr, accessor.GetNamespace(), accessor.GetName())
+	if err == nil {
+		oldAccessor, err := meta.Accessor(old)
+		if err == nil {
+			if len(oldAccessor.GetFinalizers()) > 0 {
+				now := metav1.Now()
+				oldAccessor.SetDeletionTimestamp(&now)
+				return c.tracker.Update(gvr, old, accessor.GetNamespace())
+			}
+		}
+	}
+
+	//TODO: implement propagation
+	return c.tracker.Delete(gvr, accessor.GetNamespace(), accessor.GetName())
+}
+
 func getGVRFromObject(obj runtime.Object, scheme *runtime.Scheme) (schema.GroupVersionResource, error) {
 	gvk, err := apiutil.GVKForObject(obj, scheme)
 	if err != nil {

pkg/client/fake/client_test.go

@@ -19,6 +19,7 @@ package fake
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
@@ -495,6 +496,41 @@ var _ = Describe("Fake client", func() {
 			Expect(list.Items).To(BeEmpty())
 		})
 
+		It("should handle finalizers deleting a collection", func() {
+			for i := 0; i < 5; i++ {
+				namespacedName := types.NamespacedName{
+					Name:      fmt.Sprintf("test-cm-%d", i),
+					Namespace: "delete-collection-with-finalizers",
+				}
+				By("Creating a new object")
+				newObj := &corev1.ConfigMap{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:       namespacedName.Name,
+						Namespace:  namespacedName.Namespace,
+						Finalizers: []string{"finalizers.sigs.k8s.io/test"},
+					},
+					Data: map[string]string{
+						"test-key": "new-value",
+					},
+				}
+				err := cl.Create(context.Background(), newObj)
+				Expect(err).To(BeNil())
+			}
+
+			By("Deleting the object")
+			err := cl.DeleteAllOf(context.Background(), &corev1.ConfigMap{}, client.InNamespace("delete-collection-with-finalizers"))
+			Expect(err).To(BeNil())
+
+			configmaps := corev1.ConfigMapList{}
+			err = cl.List(context.Background(), &configmaps, client.InNamespace("delete-collection-with-finalizers"))
+			Expect(err).To(BeNil())
+
+			Expect(len(configmaps.Items)).To(Equal(5))
+			for _, cm := range configmaps.Items {
+				Expect(cm.DeletionTimestamp).NotTo(BeNil())
+			}
+		})
+
 		Context("with the DryRun option", func() {
 			It("should not create a new object", func() {
 				By("Creating a new configmap with DryRun")