🌱 (e2e): test: skip terminating pods in catalog image update test (#3703)

* (e2e): test: skip terminating pods in catalog image update test

Filter out pods with DeletionTimestamp to avoid false failures
during pod rollouts when old pods are being deleted.

Fixes flaky test failure where test found 2 pods (1 terminating,
1 active) and incorrectly failed on pod count instead of verifying
the actual requirement: catalog image was updated.

Assisted-by: Cursor

* Address reviewer comments

Signed-off-by: Per Goncalves da Silva <[email protected]>

---------

Signed-off-by: Per Goncalves da Silva <[email protected]>
Co-authored-by: Per Goncalves da Silva <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: e3391c6d4e8b83b39c43955218b4589e60cb0e77

Author: 2 people

staging/operator-lifecycle-manager/test/e2e/catalog_e2e_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+
 	"k8s.io/apimachinery/pkg/util/intstr"
 
 	"net"
@@ -1169,6 +1170,10 @@ var _ = Describe("Starting CatalogSource e2e tests", Label("CatalogSource"), fun
 			}
 
 			for _, pod := range podList.Items {
+				// Ignore terminating pods
+				if pod.DeletionTimestamp != nil {
+					continue
+				}
 				ctx.Ctx().Logf("old image id %s\n new image id %s\n", registryPod.Items[0].Status.ContainerStatuses[0].ImageID,
 					pod.Status.ContainerStatuses[0].ImageID)
 				if pod.Status.ContainerStatuses[0].ImageID != registryPod.Items[0].Status.ContainerStatuses[0].ImageID {
@@ -1194,10 +1199,11 @@ var _ = Describe("Starting CatalogSource e2e tests", Label("CatalogSource"), fun
 			return false
 		}
 		By("await new catalog source and ensure old one was deleted")
+		// the required check for ensuring there's a non-terminating pod with the new image is covered in the podCheckFunc
 		registryPods, err = awaitPodsWithInterval(GinkgoT(), c, source.GetNamespace(), selector.String(), 30*time.Second, 10*time.Minute, podCheckFunc)
 		Expect(err).ShouldNot(HaveOccurred(), "error awaiting registry pod")
 		Expect(registryPods).ShouldNot(BeNil(), "nil registry pods")
-		Expect(registryPods.Items).To(HaveLen(1), "unexpected number of registry pods found")
+		Expect(registryPods.Items).ToNot(BeEmpty(), "no registry pods found")
 
 		By("update catalog source with annotation (to kick resync)")
 		Eventually(func() error {