Merge pull request kubernetes#89536 from tedyu/automated-cherry-pick-of-#88348-upstream-release-1.18

k8s-ci-robot · web-flow · commit 93e62e60d1d0 · 2020-03-27T14:07:54.000-07:00
Automated cherry pick of kubernetes#88348: Check that ImageInspect pointer is not nil
diff --git a/pkg/kubelet/dockershim/docker_container.go b/pkg/kubelet/dockershim/docker_container.go
@@ -415,7 +415,7 @@ func (ds *dockerService) ContainerStatus(_ context.Context, req *runtimeapi.Cont
 
 	labels, annotations := extractLabels(r.Config.Labels)
 	imageName := r.Config.Image
-	if len(ir.RepoTags) > 0 {
+	if ir != nil && len(ir.RepoTags) > 0 {
 		imageName = ir.RepoTags[0]
 	}
 	status := &runtimeapi.ContainerStatus{

Original file line number	Diff line number	Diff line change
`@@ -415,7 +415,7 @@ func (ds dockerService) ContainerStatus(_ context.Context, req runtimeapi.Cont`
`415`	`415`
`416`	`416`	`labels, annotations := extractLabels(r.Config.Labels)`
`417`	`417`	`imageName := r.Config.Image`
`418`		`- if len(ir.RepoTags) > 0 {`
	`418`	`+ if ir != nil && len(ir.RepoTags) > 0 {`
`419`	`419`	`imageName = ir.RepoTags[0]`
`420`	`420`	`}`
`421`	`421`	`status := &runtimeapi.ContainerStatus{`