From a304297c99d5e4d49bb6bb7a3e009f896611e2d7 Mon Sep 17 00:00:00 2001 From: Pengfei Ni Date: Thu, 14 Mar 2019 18:53:02 +0800 Subject: [PATCH] Fix panic when removing docker images --- pkg/kubelet/dockershim/docker_image.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/kubelet/dockershim/docker_image.go b/pkg/kubelet/dockershim/docker_image.go index fb7cdd70b7..b28472f19c 100644 --- a/pkg/kubelet/dockershim/docker_image.go +++ b/pkg/kubelet/dockershim/docker_image.go @@ -127,6 +127,11 @@ func (ds *dockerService) RemoveImage(_ context.Context, r *runtimeapi.RemoveImag return nil, err } + if imageInspect == nil { + // image is nil, assuming it doesn't exist. + return &runtimeapi.RemoveImageResponse{}, nil + } + // An image can have different numbers of RepoTags and RepoDigests. // Iterating over both of them plus the image ID ensures the image really got removed. // It also prevents images from being deleted, which actually are deletable using this approach.