Merge pull request #59465 from hanxiaoshuai/fixtodo02071

Automatic merge from submit-queue (batch tested with PRs 60363, 59208, 59465, 60581, 60702). 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>. log an error message when imageToRuntimeAPIImage failed **What this PR does / why we need it**: fix todo: log an error message when imageToRuntimeAPIImage failed **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #59465 from hanxiaoshuai/fixtodo02071
d0e9118d · Kubernetes Submit Queue · GitHub · 854002c3 · ba3bab99 · d0e9118d
Unverified Commit d0e9118d authored Mar 20, 2018 by Kubernetes Submit Queue Committed by GitHub Mar 20, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

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

No files found.
--- a/pkg/kubelet/dockershim/docker_image.go
+++ b/pkg/kubelet/dockershim/docker_image.go
@@ -25,6 +25,7 @@ import (
 	"github.com/docker/docker/pkg/jsonmessage"
 	"golang.org/x/net/context"
+	"github.com/golang/glog"
 	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
 	"k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker"
 )
@@ -51,7 +52,7 @@ func (ds *dockerService) ListImages(_ context.Context, r *runtimeapi.ListImagesR
 	for _, i := range images {
 		apiImage, err := imageToRuntimeAPIImage(&i)
 		if err != nil {
-			// TODO: log an error message?
+			glog.V(5).Infof("Failed to convert docker API image %+v to runtime API image: %v", i, err)
 			continue
 		}
 		result = append(result, apiImage)