github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues 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
commit 51164f11ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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)
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)