github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Support image status by ID.

Browse Source
This commit is contained in:
Lantao Liu 2019-06-04 11:34:38 -07:00
parent b7fa33ec15
commit e27b263f37
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,10 +66,16 @@ func (ds *dockerService) ImageStatus(_ context.Context, r *runtimeapi.ImageStatu
imageInspect, err := ds.client.InspectImageByRef(image.Image) imageInspect, err := ds.client.InspectImageByRef(image.Image)
if err != nil { if err != nil {
if libdocker.IsImageNotFoundError(err) { if !libdocker.IsImageNotFoundError(err) {
return &runtimeapi.ImageStatusResponse{}, nil 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) imageStatus, err := imageInspectToRuntimeAPIImage(imageInspect)