From 0169dce5858d2c3c81e16cd06fe1cfb51194c4f9 Mon Sep 17 00:00:00 2001 From: Samuel Ortiz Date: Thu, 16 Mar 2017 10:42:31 +0100 Subject: [PATCH] container: Add image ID and name to the container status Kubelet 1.6 seems to request that those fields must be present. Signed-off-by: Samuel Ortiz --- server/container_status.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/server/container_status.go b/server/container_status.go index 4afd9118..4d3dd4bf 100644 --- a/server/container_status.go +++ b/server/container_status.go @@ -16,18 +16,27 @@ func (s *Server) ContainerStatus(ctx context.Context, req *pb.ContainerStatusReq return nil, err } - if err := s.runtime.UpdateStatus(c); err != nil { + if err = s.runtime.UpdateStatus(c); err != nil { return nil, err } containerID := c.ID() + image := c.Image() resp := &pb.ContainerStatusResponse{ Status: &pb.ContainerStatus{ Id: containerID, Metadata: c.Metadata(), + Image: image, }, } + status, err := s.images.ImageStatus(s.imageContext, image.Image) + if err != nil { + return nil, err + } + + resp.Status.ImageRef = status.ID + cState := s.runtime.ContainerStatus(c) rStatus := pb.ContainerState_CONTAINER_UNKNOWN