Sped up tests by 1.5seconds/test

pkg/controllers/provisioning/provisioner.go

@@ -145,13 +145,13 @@ func (p *Provisioner) batch(ctx context.Context) (pods []*v1.Pod) {
 		logging.FromContext(ctx).Infof("Batched %d pods in %s", len(pods), time.Since(start))
 	}()
 	for {
+		if len(pods) >= MaxPodsPerBatch {
+			return pods
+		}
 		select {
 		case pod := <-p.pods:
 			idle.Reset(MinBatchDuration)
 			pods = append(pods, pod)
-			if len(pods) >= MaxPodsPerBatch {
-				return pods
-			}
 		case <-ctx.Done():
 			return pods
 		case <-timeout.C:

pkg/test/expectations/expectations.go

@@ -22,6 +22,7 @@ import (
 
 	//nolint:revive,stylecheck
 	. "github.com/onsi/gomega"
+
 	appsv1 "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/api/policy/v1beta1"
@@ -110,44 +111,40 @@ func ExpectCreatedWithStatus(ctx context.Context, c client.Client, objects ...cl
 
 func ExpectDeleted(ctx context.Context, c client.Client, objects ...client.Object) {
 	for _, object := range objects {
-		persisted := object.DeepCopyObject()
-		object.SetFinalizers([]string{})
-		Expect(c.Patch(ctx, object, client.MergeFrom(persisted.(client.Object)))).To(Succeed())
 		if err := c.Delete(ctx, object, &client.DeleteOptions{GracePeriodSeconds: ptr.Int64(0)}); !errors.IsNotFound(err) {
 			Expect(err).To(BeNil())
 		}
-	}
-	for _, object := range objects {
 		ExpectNotFound(ctx, c, object)
 	}
 }
 
 func ExpectCleanedUp(ctx context.Context, c client.Client) {
-	pdbs := v1beta1.PodDisruptionBudgetList{}
-	Expect(c.List(ctx, &pdbs)).To(Succeed())
-	for i := range pdbs.Items {
-		ExpectDeleted(ctx, c, &pdbs.Items[i])
-	}
-	pods := v1.PodList{}
-	Expect(c.List(ctx, &pods)).To(Succeed())
-	for i := range pods.Items {
-		ExpectDeleted(ctx, c, &pods.Items[i])
-	}
-	nodes := v1.NodeList{}
-	Expect(c.List(ctx, &nodes)).To(Succeed())
+	wg := sync.WaitGroup{}
+	namespaces := &v1.NamespaceList{}
+	Expect(c.List(ctx, namespaces)).To(Succeed())
+	nodes := &v1.NodeList{}
+	Expect(c.List(ctx, nodes))
 	for i := range nodes.Items {
-		ExpectDeleted(ctx, c, &nodes.Items[i])
-	}
-	daemonsets := appsv1.DaemonSetList{}
-	Expect(c.List(ctx, &daemonsets)).To(Succeed())
-	for i := range daemonsets.Items {
-		ExpectDeleted(ctx, c, &daemonsets.Items[i])
-	}
-	provisioners := v1alpha5.ProvisionerList{}
-	Expect(c.List(ctx, &provisioners)).To(Succeed())
-	for i := range provisioners.Items {
-		ExpectDeleted(ctx, c, &provisioners.Items[i])
+		nodes.Items[i].SetFinalizers([]string{})
+		Expect(c.Update(ctx, &nodes.Items[i])).To(Succeed())
+	}
+	for _, object := range []client.Object{
+		&v1.Pod{},
+		&v1.Node{},
+		&appsv1.DaemonSet{},
+		&v1beta1.PodDisruptionBudget{},
+		&v1.PersistentVolumeClaim{},
+		&v1alpha5.Provisioner{},
+	} {
+		for _, namespace := range namespaces.Items {
+			wg.Add(1)
+			go func(object client.Object, namespace string) {
+				Expect(c.DeleteAllOf(ctx, object, client.InNamespace(namespace))).ToNot(HaveOccurred())
+				wg.Done()
+			}(object, namespace.Name)
+		}
 	}
+	wg.Wait()
 }
 
 // ExpectProvisioningCleanedUp includes additional cleanup logic for provisioning workflows
@@ -161,6 +158,7 @@ func ExpectProvisioningCleanedUp(ctx context.Context, c client.Client, controlle
 }
 
 func ExpectProvisioned(ctx context.Context, c client.Client, selectionController *selection.Controller, provisioningController *provisioning.Controller, provisioner *v1alpha5.Provisioner, pods ...*v1.Pod) (result []*v1.Pod) {
+	provisioning.MaxPodsPerBatch = len(pods)
 	// Persist objects
 	ExpectApplied(ctx, c, provisioner)
 	ExpectStatusUpdated(ctx, c, provisioner)