Skip to content
This repository was archived by the owner on Sep 2, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions pkg/client/image/remove.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package image
import (
"context"

"github.com/pkg/errors"
imagesv1 "github.com/rancher/kim/pkg/apis/services/images/v1alpha1"
"github.com/rancher/kim/pkg/client"
"github.com/sirupsen/logrus"
Expand All @@ -17,6 +18,9 @@ func (s *Remove) Do(ctx context.Context, k8s *client.Interface, image string) er
if err != nil {
return err
}
if ref == nil {
return errors.Errorf("image %q: not found", image)
}
res, err := imagesClient.Remove(ctx, &imagesv1.ImageRemoveRequest{Image: ref})
logrus.Debugf("%#v", res)
return err
Expand Down
3 changes: 3 additions & 0 deletions pkg/server/images/remove.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ func (s *Server) Remove(ctx context.Context, req *imagesv1.ImageRemoveRequest) (
return nil, err
}
defer done(ctx)
if req.Image == nil {
return &imagesv1.ImageRemoveResponse{}, nil
}
img, err := s.Containerd.ImageService().Get(ctx, req.Image.Image)
if err != nil {
return nil, err
Expand Down