Merge pull request #54125 from feiskyer/docker-images

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fix dockershim panic when listing images **What this PR does / why we need it**: dockershim panic when listing containers because of `opts.Filters` not initialized: https://github.com/kubernetes/kubernetes/blob/505ccb88da14d8dda25cb9ea4db8578666b9cc0e/pkg/kubelet/dockershim/docker_image.go#L35-L39 Also when imgSpec.Image is empty string, dockershim returns an empty image list which is not expected. (We should not set opts.Filters in this case). **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #54122 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #54125 from feiskyer/docker-images
ba66fcb6 · Kubernetes Submit Queue · GitHub · 191ff804 · 77ed72f5 · ba66fcb6
Commit ba66fcb6 authored Oct 19, 2017 by Kubernetes Submit Queue Committed by GitHub Oct 19, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

docker_image.go pkg/kubelet/dockershim/docker_image.go +4 -2

No files found.
--- a/pkg/kubelet/dockershim/docker_image.go
+++ b/pkg/kubelet/dockershim/docker_image.go
@@ -21,6 +21,7 @@ import (
 	"net/http"
 	dockertypes "github.com/docker/docker/api/types"
+	dockerfilters "github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/pkg/jsonmessage"
 	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
@@ -33,8 +34,9 @@ import (
 func (ds *dockerService) ListImages(filter *runtimeapi.ImageFilter) ([]*runtimeapi.Image, error) {
 	opts := dockertypes.ImageListOptions{}
 	if filter != nil {
-		if imgSpec := filter.GetImage(); imgSpec != nil {
+		if filter.GetImage().GetImage() != "" {
-			opts.Filters.Add("reference", imgSpec.Image)
+			opts.Filters = dockerfilters.NewArgs()
+			opts.Filters.Add("reference", filter.GetImage().GetImage())
 		}
 	}