Skip to content

pkg/cli/admin/prune/images: Allow partial image retrieval #2010

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 1 commit into
base: main
Choose a base branch
from
Open

pkg/cli/admin/prune/images: Allow partial image retrieval #2010

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
11 changes: 10 additions & 1 deletion pkg/cli/admin/prune/images/images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,7 @@ func (o PruneImagesOptions) Run() error {

ctx := context.TODO()
allImages := map[string]*imagev1.Image{}
var acceptableErrors []error
err = pager.New(func(ctx context.Context, opts metav1.ListOptions) (runtime.Object, error) {
return o.ImageClient.Images().List(ctx, opts)
}).EachListItem(ctx, metav1.ListOptions{Limit: 5000}, func(obj runtime.Object) error {
Expand All @@ -421,7 +422,12 @@ func (o PruneImagesOptions) Run() error {
return nil
})
if err != nil {
return err
if len(allImages) > 0 {
fmt.Fprintf(o.ErrOut, "warning: error retrieving images, but we got %d, so keep going to see if we can prune any of those: %s\n", len(allImages), err)
acceptableErrors = append(acceptableErrors, err)
} else {
return err
}
}

var (
Expand Down Expand Up @@ -528,6 +534,9 @@ func (o PruneImagesOptions) Run() error {
imageDeleter,
)
fmt.Fprintf(o.Out, "Summary: %s\n", stats)
if errs == nil {
errs = kutilerrors.NewAggregate(acceptableErrors)
}
return errs
}

Expand Down