96fb47213e
We had a bug in ImageStatus where we weren't returning the default image user if set, thus running all containers as root despite a user being set in the image config. We weren't populating the Username field of ImageStatus. This patch fixes that along with the handling of multiple images based on the registry patch for multiple images. It also fixes ListImages to return Username as well. Signed-off-by: Antonio Murdaca <runcom@redhat.com>
51 lines
1.2 KiB
Go
51 lines
1.2 KiB
Go
package server
|
|
|
|
import (
|
|
"time"
|
|
|
|
"github.com/sirupsen/logrus"
|
|
"golang.org/x/net/context"
|
|
pb "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
|
|
)
|
|
|
|
// ListImages lists existing images.
|
|
func (s *Server) ListImages(ctx context.Context, req *pb.ListImagesRequest) (resp *pb.ListImagesResponse, err error) {
|
|
const operation = "list_images"
|
|
defer func() {
|
|
recordOperation(operation, time.Now())
|
|
recordError(operation, err)
|
|
}()
|
|
|
|
logrus.Debugf("ListImagesRequest: %+v", req)
|
|
filter := ""
|
|
reqFilter := req.GetFilter()
|
|
if reqFilter != nil {
|
|
filterImage := reqFilter.GetImage()
|
|
if filterImage != nil {
|
|
filter = filterImage.Image
|
|
}
|
|
}
|
|
results, err := s.StorageImageServer().ListImages(s.ImageContext(), filter)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
resp = &pb.ListImagesResponse{}
|
|
for _, result := range results {
|
|
resImg := &pb.Image{
|
|
Id: result.ID,
|
|
RepoTags: result.RepoTags,
|
|
RepoDigests: result.RepoDigests,
|
|
}
|
|
uid, username := getUserFromImage(result.User)
|
|
if uid != nil {
|
|
resImg.Uid = &pb.Int64Value{Value: *uid}
|
|
}
|
|
resImg.Username = username
|
|
if result.Size != nil {
|
|
resImg.Size_ = *result.Size
|
|
}
|
|
resp.Images = append(resp.Images, resImg)
|
|
}
|
|
logrus.Debugf("ListImagesResponse: %+v", resp)
|
|
return resp, nil
|
|
}
|