github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #78603 from Random-Liu/fix-image-status

Browse Source 
Fix image status
This commit is contained in:
Kubernetes Prow Robot
2019-06-14 13:26:22 -07:00
committed by GitHub
parent 9f1548cdd9 e27b263f37
commit 51164f11ae
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubelet/dockershim/docker_image.go
View File

@@ -65,12 +65,18 @@ func (ds *dockerService) ImageStatus(_ context.Context, r *runtimeapi.ImageStatu
image := r.GetImage() image := r.GetImage()
imageInspect, err := ds.client.InspectImageByRef(image.Image) imageInspect, err := ds.client.InspectImageByRef(image.Image)
if err != nil {
if !libdocker.IsImageNotFoundError(err) {
return nil, err
}
imageInspect, err = ds.client.InspectImageByID(image.Image)
if err != nil { if err != nil {
if libdocker.IsImageNotFoundError(err) { if libdocker.IsImageNotFoundError(err) {
return &runtimeapi.ImageStatusResponse{}, nil return &runtimeapi.ImageStatusResponse{}, nil
} }
return nil, err return nil, err
} }
}
imageStatus, err := imageInspectToRuntimeAPIImage(imageInspect) imageStatus, err := imageInspectToRuntimeAPIImage(imageInspect)
if err != nil { if err != nil {