github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 07:47:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #88348 from tedyu/image-not-nil

Browse Source 
Check that ImageInspect pointer is not nil
This commit is contained in:
Kubernetes Prow Robot 2020-03-17 16:21:01 -07:00 committed by GitHub
commit 761c72f691
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -415,7 +415,7 @@ func (ds *dockerService) ContainerStatus(_ context.Context, req *runtimeapi.Cont
labels, annotations := extractLabels(r.Config.Labels) labels, annotations := extractLabels(r.Config.Labels)
imageName := r.Config.Image imageName := r.Config.Image
if len(ir.RepoTags) > 0 { if ir != nil && len(ir.RepoTags) > 0 {
imageName = ir.RepoTags[0] imageName = ir.RepoTags[0]
} }
status := &runtimeapi.ContainerStatus{ status := &runtimeapi.ContainerStatus{