Skip to content

OCPBUGS-78997: Do not discard ListOptions in waitForPodCompletion. #1361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Mar 26, 2026
Merged

OCPBUGS-78997: Do not discard ListOptions in waitForPodCompletion. #1361

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions pkg/cvo/updatepayload.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
},
Comment on lines +376 to 383

@coderabbitai coderabbitai Bot Mar 26, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Merge incoming FieldSelector instead of overwriting it

options.FieldSelector = fieldSelector still discards any existing selector. That misses the PR goal and can change filter behavior unexpectedly. Merge the existing selector with the pod-name selector in both callbacks.

Proposed fix 
 func waitForPodCompletion(ctx context.Context, podListerWatcher PodListerWatcher, name string) error {
-	fieldSelector := fields.OneTermEqualSelector("metadata.name", name).String()
+	podNameSelector := fields.OneTermEqualSelector("metadata.name", name)
+	mergeFieldSelector := func(options metav1.ListOptions) (metav1.ListOptions, error) {
+		if options.FieldSelector == "" {
+			options.FieldSelector = podNameSelector.String()
+			return options, nil
+		}
+		existing, err := fields.ParseSelector(options.FieldSelector)
+		if err != nil {
+			return options, fmt.Errorf("invalid field selector %q: %w", options.FieldSelector, err)
+		}
+		options.FieldSelector = fields.AndSelectors(existing, podNameSelector).String()
+		return options, nil
+	}
 	_, err := toolswatch.UntilWithSync(
 		ctx,
 		&cache.ListWatch{
 			ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
-				options.FieldSelector = fieldSelector
-				return podListerWatcher.List(ctx, options)
+				merged, err := mergeFieldSelector(options)
+				if err != nil {
+					return nil, err
+				}
+				return podListerWatcher.List(ctx, merged)
 			},
 			WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
-				options.FieldSelector = fieldSelector
-				return podListerWatcher.Watch(ctx, options)
+				merged, err := mergeFieldSelector(options)
+				if err != nil {
+					return nil, err
+				}
+				return podListerWatcher.Watch(ctx, merged)
 			},
 		},
 		&corev1.Pod{},
 		nil,
🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In `@pkg/cvo/updatepayload.go` around lines 376 - 383, The ListFunc and WatchFunc
currently overwrite options.FieldSelector with fieldSelector, discarding any
existing selector; change both callbacks to merge the incoming
options.FieldSelector with the pod-name selector instead of replacing it (e.g.,
if options.FieldSelector is empty use fieldSelector, otherwise combine them with
a comma separator), then pass the merged selector to podListerWatcher.List(ctx,
options) and podListerWatcher.Watch(ctx, options); update the ListFunc and
WatchFunc closures that set options.FieldSelector to perform this merge so
existing filters are preserved.

},
&corev1.Pod{},
Expand Down