befd719812
This reverts commit4c06116c18, reversing changes made toc5e73ba65f. Signed-off-by: Antonio Murdaca <runcom@redhat.com>
58 lines
1.3 KiB
Go
58 lines
1.3 KiB
Go
package server
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/sirupsen/logrus"
|
|
"golang.org/x/net/context"
|
|
pb "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
|
|
)
|
|
|
|
// RemoveImage removes the image.
|
|
func (s *Server) RemoveImage(ctx context.Context, req *pb.RemoveImageRequest) (resp *pb.RemoveImageResponse, err error) {
|
|
const operation = "remove_image"
|
|
defer func() {
|
|
recordOperation(operation, time.Now())
|
|
recordError(operation, err)
|
|
}()
|
|
|
|
logrus.Debugf("RemoveImageRequest: %+v", req)
|
|
image := ""
|
|
img := req.GetImage()
|
|
if img != nil {
|
|
image = img.Image
|
|
}
|
|
if image == "" {
|
|
return nil, fmt.Errorf("no image specified")
|
|
}
|
|
var (
|
|
images []string
|
|
deleted bool
|
|
)
|
|
images, err = s.StorageImageServer().ResolveNames(image)
|
|
if err != nil {
|
|
// This means we got an image ID
|
|
if strings.Contains(err.Error(), "cannot specify 64-byte hexadecimal strings") {
|
|
images = append(images, image)
|
|
} else {
|
|
return nil, err
|
|
}
|
|
}
|
|
for _, img := range images {
|
|
err = s.StorageImageServer().RemoveImage(s.ImageContext(), img)
|
|
if err != nil {
|
|
logrus.Debugf("error deleting image %s: %v", img, err)
|
|
continue
|
|
}
|
|
deleted = true
|
|
break
|
|
}
|
|
if !deleted && err != nil {
|
|
return nil, err
|
|
}
|
|
resp = &pb.RemoveImageResponse{}
|
|
logrus.Debugf("RemoveImageResponse: %+v", resp)
|
|
return resp, nil
|
|
}
|