From e27b263f37f7dab3e8b224eace819782566e8ac9 Mon Sep 17 00:00:00 2001 From: Lantao Liu Date: Tue, 4 Jun 2019 11:34:38 -0700 Subject: [PATCH] Support image status by ID. --- pkg/kubelet/dockershim/docker_image.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkg/kubelet/dockershim/docker_image.go b/pkg/kubelet/dockershim/docker_image.go index 0c44d7dd92d..356f34d0ec9 100644 --- a/pkg/kubelet/dockershim/docker_image.go +++ b/pkg/kubelet/dockershim/docker_image.go @@ -66,10 +66,16 @@ func (ds *dockerService) ImageStatus(_ context.Context, r *runtimeapi.ImageStatu imageInspect, err := ds.client.InspectImageByRef(image.Image) if err != nil { - if libdocker.IsImageNotFoundError(err) { - return &runtimeapi.ImageStatusResponse{}, nil + if !libdocker.IsImageNotFoundError(err) { + return nil, err + } + imageInspect, err = ds.client.InspectImageByID(image.Image) + if err != nil { + if libdocker.IsImageNotFoundError(err) { + return &runtimeapi.ImageStatusResponse{}, nil + } + return nil, err } - return nil, err } imageStatus, err := imageInspectToRuntimeAPIImage(imageInspect)