Skip to content

NO-JIRA: Improve must-gather image handling and annotation checks- #2071 #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
midu16 wants to merge 6 commits into
base: main
Choose a base branch
from
+11 −4
Open

NO-JIRA: Improve must-gather image handling and annotation checks- #2071 #2071

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cf8b4e2
Fix undefined csvs in mustgather and add CSV annotation warning
midu16 Jul 23, 2026
2c804f3
must-gather: move missing-annotation logging to caller
Jul 29, 2026
4b4339a
must-gather: improve missing-annotation variable naming
Jul 29, 2026
afbcfb7
must-gather: rename missingAnnotation to annotationMissingImages
Jul 29, 2026
5009c1e
must-gather: deduplicate CSV warning and remove CO warning
Jul 31, 2026
ac0495e
must-gather: use sets.Set for CSV deduplication
Jul 31, 2026
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
16 changes: 12 additions & 4 deletions pkg/cli/admin/mustgather/mustgather.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@ import (
"errors"
"fmt"
"io"
"maps"
"math/rand"
"os"
"os/signal"
"path"
"regexp"
"slices"
"sort"
"strconv"
"strings"
Expand Down Expand Up @@ -341,7 +343,7 @@ func (o *MustGatherOptions) completeImages(ctx context.Context) error {
}
if o.AllImages {
// find all csvs and clusteroperators with the annotation "operators.openshift.io/must-gather-image"
pluginImages, err := o.annotatedCSVs(ctx)
pluginImages, annotationMissingCSVs, err := o.annotatedCSVs(ctx)
if err != nil {
return err
}
Expand All @@ -356,6 +358,9 @@ func (o *MustGatherOptions) completeImages(ctx context.Context) error {
pluginImages[v] = struct{}{}
}
}
if len(annotationMissingCSVs) > 0 {
o.log("CSVs without %s annotation: %s", mgAnnotation, strings.Join(annotationMissingCSVs, ", "))
}
// delete the default image to avoid duplication in case an Operator had it in its annotation
delete(pluginImages, o.Images[0])
for i := range pluginImages {
Expand All @@ -367,7 +372,7 @@ func (o *MustGatherOptions) completeImages(ctx context.Context) error {
return nil
}

func (o *MustGatherOptions) annotatedCSVs(ctx context.Context) (map[string]struct{}, error) {
func (o *MustGatherOptions) annotatedCSVs(ctx context.Context) (map[string]struct{}, []string, error) {
csvGVR := schema.GroupVersionResource{
Group: "operators.coreos.com",
Version: "v1alpha1",
Expand All @@ -377,16 +382,19 @@ func (o *MustGatherOptions) annotatedCSVs(ctx context.Context) (map[string]struc

csvs, err := o.DynamicClient.Resource(csvGVR).List(ctx, metav1.ListOptions{})
if err != nil {
return nil, err
return nil, nil, err
}

annotationMissingImages := make(map[string]struct{})
Comment thread
midu16 marked this conversation as resolved.
Outdated
for _, item := range csvs.Items {
ann := item.GetAnnotations()
if v, ok := ann[mgAnnotation]; ok {
pluginImages[v] = struct{}{}
} else {
annotationMissingImages[item.GetName()] = struct{}{}
}
}
return pluginImages, nil
return pluginImages, slices.Sorted(maps.Keys(annotationMissingImages)), nil
}

func (o *MustGatherOptions) resolveImageStreamTagString(ctx context.Context, s string) (string, error) {
Expand Down