vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

server: container_status: we should return digested references in imageRef

Browse source 
currently blocked on
https://github.com/kubernetes-incubator/cri-o/issues/531

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
Antonio Murdaca 2017-05-20 17:08:00 +02:00
parent 22d055869d
commit d099e3a988
No known key found for this signature in database
GPG key ID: B2BEAD150DE936B9
5 changed files with 66 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
server/container_status.go
View file

@ -47,9 +47,21 @@ func (s *Server) ContainerStatus(ctx context.Context, req *pb.ContainerStatusReq
return nil, err
}
// TODO: use status.ID only if no digested names!!!
// need to modify ImageStatus to split tagged and digested!
resp.Status.ImageRef = status.ID
imageRef := status.ID
//
// TODO: https://github.com/kubernetes-incubator/cri-o/issues/531
//
//for _, n := range status.Names {
//r, err := reference.ParseNormalizedNamed(n)
//if err != nil {
//return nil, fmt.Errorf("failed to normalize image name for ImageRef: %v", err)
//}
//if digested, isDigested := r.(reference.Canonical); isDigested {
//imageRef = reference.FamiliarString(digested)
//break
//}
//}
resp.Status.ImageRef = imageRef
for _, n := range status.Names {
r, err := reference.ParseNormalizedNamed(n)