From c39ef7587c7fdd48643c312378220e02fa5cdf12 Mon Sep 17 00:00:00 2001
From: Jacob See <5027680+jacobsee@users.noreply.github.com>
Date: Thu, 26 Mar 2026 12:37:58 -0700
Subject: [PATCH] Do not discard ListOptions in waitForPodCompletion.

merge the fieldSelector in instead.
---
 pkg/cvo/updatepayload.go | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkg/cvo/updatepayload.go b/pkg/cvo/updatepayload.go
index 5c08e55beb..acf31aff00 100644
--- a/pkg/cvo/updatepayload.go
+++ b/pkg/cvo/updatepayload.go
@@ -373,11 +373,13 @@ func waitForPodCompletion(ctx context.Context, podListerWatcher PodListerWatcher
 	_, err := toolswatch.UntilWithSync(
 		ctx,
 		&cache.ListWatch{
-			ListFunc: func(options metav1.ListOptions) (object runtime.Object, e error) {
-				return podListerWatcher.List(ctx, metav1.ListOptions{FieldSelector: fieldSelector})
+			ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
+				options.FieldSelector = fieldSelector
+				return podListerWatcher.List(ctx, options)
 			},
 			WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
-				return podListerWatcher.Watch(ctx, metav1.ListOptions{FieldSelector: fieldSelector})
+				options.FieldSelector = fieldSelector
+				return podListerWatcher.Watch(ctx, options)
 			},
 		},
 		&corev1.Pod{},