github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #84401 from xiaoanyunfei/bugfix/inspect-docker-image

Browse Source 
ignore image err when docker image has been cleaned up
This commit is contained in:
Kubernetes Prow Robot 2019-11-25 19:11:10 -08:00 committed by GitHub
commit b84fad5e6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/dockershim/convert.go
View File

@ -69,7 +69,7 @@ func toPullableImageID(id string, image *dockertypes.ImageInspect) string {
// Default to the image ID, but if RepoDigests is not empty, use // Default to the image ID, but if RepoDigests is not empty, use
// the first digest instead. // the first digest instead.
imageID := DockerImageIDPrefix + id imageID := DockerImageIDPrefix + id
if len(image.RepoDigests) > 0 { if image != nil && len(image.RepoDigests) > 0 {
imageID = DockerPullableImageIDPrefix + image.RepoDigests[0] imageID = DockerPullableImageIDPrefix + image.RepoDigests[0]
} }
return imageID return imageID

5
pkg/kubelet/dockershim/docker_container.go
View File

@ -347,7 +347,10 @@ func (ds *dockerService) ContainerStatus(_ context.Context, req *runtimeapi.Cont
// Convert the image id to a pullable id. // Convert the image id to a pullable id.
ir, err := ds.client.InspectImageByID(r.Image) ir, err := ds.client.InspectImageByID(r.Image)
if err != nil { if err != nil {
return nil, fmt.Errorf("unable to inspect docker image %q while inspecting docker container %q: %v", r.Image, containerID, err) if !libdocker.IsImageNotFoundError(err) {
return nil, fmt.Errorf("unable to inspect docker image %q while inspecting docker container %q: %v", r.Image, containerID, err)
}
klog.Warningf("ignore error image %q not found while inspecting docker container %q: %v", r.Image, containerID, err)
} }
imageID := toPullableImageID(r.Image, ir) imageID := toPullableImageID(r.Image, ir)