Add DeleteAndWait function for ClusterClass flaky test

Signed-off-by: killianmuldoon <kmuldoon@vmware.com>

internal/test/envtest/environment.go

@@ -422,6 +422,28 @@ func (e *Environment) CreateAndWait(ctx context.Context, obj client.Object, opts
 	return nil
 }
 
+// DeleteAndWait deletes the given object and waits for it to be not available from the API Server.
+func (e *Environment) DeleteAndWait(ctx context.Context, obj client.Object) error {
+	err := e.Client.Delete(ctx, obj)
+	if !apierrors.IsNotFound(err) {
+		return err
+	}
+	oCopy := obj.DeepCopyObject().(client.Object)
+	key := client.ObjectKeyFromObject(obj)
+	err = wait.ExponentialBackoff(
+		cacheSyncBackoff,
+		func() (done bool, err error) {
+			if err := e.Get(ctx, key, oCopy); err != nil {
+				if apierrors.IsNotFound(err) {
+					return true, nil
+				}
+				return false, err
+			}
+			return false, nil
+		})
+	return err
+}
+
 // PatchAndWait creates or updates the given object using server-side apply and waits for the cache to be updated accordingly.
 //
 // NOTE: Waiting for the cache to be updated helps in preventing test flakes due to the cache sync delays.

internal/webhooks/test/clusterclass_test.go

@@ -446,7 +446,7 @@ func TestClusterClassWebhook_Delete_MultipleExistingClusters(t *testing.T) {
 	defer func() {
 		// Delete each of the clusters.
 		for _, c := range clusters {
-			g.Expect(env.Delete(ctx, c)).To(Succeed())
+			g.Expect(env.DeleteAndWait(ctx, c)).To(Succeed())
 		}
 
 		// Delete the ClusterClasses in the API server.