Skip to content

Improve must-gather image handling and annotation checks #2071

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

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Improve must-gather image handling and annotation checks #2071

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8dde6cd
enhance must-gather image collection with CSV annotation warnings
midu16 Aug 7, 2025
4358b67
Merge branch 'openshift:main' into master
midu16 Sep 17, 2025
3845d4b
Fix compile error
midu16 Sep 17, 2025
1554bb5
Merge branch 'openshift:main' into master
midu16 Sep 17, 2025
e9f3105
Revert "Fix compile error"
midu16 Sep 17, 2025
8b0bde2
Merge branch 'openshift:main' into master
midu16 Sep 17, 2025
93561ce
Merge branch 'main' into master
midu16 Nov 26, 2025
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
15 changes: 12 additions & 3 deletions pkg/cli/admin/mustgather/mustgather.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,7 @@ func (o *MustGatherOptions) completeImages(ctx context.Context) error {
return fmt.Errorf("unable to resolve image stream '%v': %v", imageStream, err)
}
}
// If no images or --all flag is set, use default must-gather image
if len(o.Images) == 0 || o.AllImages {
var image string
var err error
Expand All @@ -284,12 +285,20 @@ func (o *MustGatherOptions) completeImages(ctx context.Context) error {

pluginImages, err = o.annotatedCSVs(ctx)
if err != nil {
return err
return fmt.Errorf("failed to list CSVs: %v", err)
}
for _, csv := range csvs.Items {
ann := csv.GetAnnotations()
if v, ok := ann[mgAnnotation]; ok {
pluginImages[v] = struct{}{}
} else {
o.log("WARNING: CSV operator %s doesn't have the must-gather-image annotation.", csv.GetName())
}
}

cos, err := o.ConfigClient.ConfigV1().ClusterOperators().List(ctx, metav1.ListOptions{})
if err != nil {
return err
return fmt.Errorf("failed to list ClusterOperators: %v", err)
}
for _, item := range cos.Items {
ann := item.GetAnnotations()
Expand All @@ -304,7 +313,7 @@ func (o *MustGatherOptions) completeImages(ctx context.Context) error {
}
}
o.log("Using must-gather plug-in image: %s", strings.Join(o.Images, ", "))

return nil
}

Expand Down