From fae2fdd052c0a397ea2bdcd3b26dd648a825453b Mon Sep 17 00:00:00 2001 From: Jon Huhn Date: Sun, 15 Jun 2025 23:30:18 -0500 Subject: [PATCH] DRA: wrap e2e finalizer update in retry --- test/e2e/dra/dra.go | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/test/e2e/dra/dra.go b/test/e2e/dra/dra.go index cba6e84551c..bcc9582c2cc 100644 --- a/test/e2e/dra/dra.go +++ b/test/e2e/dra/dra.go @@ -1540,12 +1540,19 @@ var _ = framework.SIGDescribe("node")(framework.WithLabel("DRA"), feature.Dynami b.create(ctx, pod, template) b.testPod(ctx, f, pod) ginkgo.DeferCleanup(func(ctx context.Context) { - // Unblock shutdown by removing the finalizer. - pod, err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Get(ctx, pod.Name, metav1.GetOptions{}) - framework.ExpectNoError(err, "get pod") - pod.Finalizers = nil - _, err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Update(ctx, pod, metav1.UpdateOptions{}) - framework.ExpectNoError(err, "remove finalizers from pod") + gomega.Eventually(ctx, func(ctx context.Context) error { + // Unblock shutdown by removing the finalizer. + pod, err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Get(ctx, pod.Name, metav1.GetOptions{}) + if err != nil { + return fmt.Errorf("get pod: %w", err) + } + pod.Finalizers = nil + _, err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).Update(ctx, pod, metav1.UpdateOptions{}) + if err != nil { + return fmt.Errorf("remove finalizers from pod: %w", err) + } + return nil + }).WithTimeout(30*time.Second).WithPolling(1*time.Second).Should(gomega.Succeed(), "Failed to remove finalizers") }) // Now evict it.