Skip to content

Commit b84fad5

Browse files
authored
Merge pull request kubernetes#84401 from xiaoanyunfei/bugfix/inspect-docker-image
ignore image err when docker image has been cleaned up
2 parents 1c5b6cb + fdbf5ef commit b84fad5

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

pkg/kubelet/dockershim/convert.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func toPullableImageID(id string, image *dockertypes.ImageInspect) string {
6969
// Default to the image ID, but if RepoDigests is not empty, use
7070
// the first digest instead.
7171
imageID := DockerImageIDPrefix + id
72-
if len(image.RepoDigests) > 0 {
72+
if image != nil && len(image.RepoDigests) > 0 {
7373
imageID = DockerPullableImageIDPrefix + image.RepoDigests[0]
7474
}
7575
return imageID

pkg/kubelet/dockershim/docker_container.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,10 @@ func (ds *dockerService) ContainerStatus(_ context.Context, req *runtimeapi.Cont
347347
// Convert the image id to a pullable id.
348348
ir, err := ds.client.InspectImageByID(r.Image)
349349
if err != nil {
350-
return nil, fmt.Errorf("unable to inspect docker image %q while inspecting docker container %q: %v", r.Image, containerID, err)
350+
if !libdocker.IsImageNotFoundError(err) {
351+
return nil, fmt.Errorf("unable to inspect docker image %q while inspecting docker container %q: %v", r.Image, containerID, err)
352+
}
353+
klog.Warningf("ignore error image %q not found while inspecting docker container %q: %v", r.Image, containerID, err)
351354
}
352355
imageID := toPullableImageID(r.Image, ir)
353356

0 commit comments

Comments
 (0)