From 48af739893f573e86c865aa1c7ee4be4d789200e Mon Sep 17 00:00:00 2001
From: Shea Levy <shea.levy@target.com>
Date: Wed, 7 Feb 2018 20:38:24 -0500
Subject: [PATCH] dockershim: Return Labels as Info in ImageStatus.

c6ddc749e85f4281628f366d65cf924c22d6cd99 added an Info field to
ImageStatusResponse when Verbose is true. This makes the image's
Labels available in that field, rather than unconditionally returning
an empty map.
---
 pkg/kubelet/dockershim/docker_image.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkg/kubelet/dockershim/docker_image.go b/pkg/kubelet/dockershim/docker_image.go
index a81c9d76319..71fe27cc207 100644
--- a/pkg/kubelet/dockershim/docker_image.go
+++ b/pkg/kubelet/dockershim/docker_image.go
@@ -76,7 +76,11 @@ func (ds *dockerService) ImageStatus(_ context.Context, r *runtimeapi.ImageStatu
 		return nil, err
 	}
 
-	return &runtimeapi.ImageStatusResponse{Image: imageStatus}, nil
+	res := runtimeapi.ImageStatusResponse{Image: imageStatus}
+	if r.GetVerbose() {
+		res.Info = imageInspect.Config.Labels
+	}
+	return &res, nil
 }
 
 // PullImage pulls an image with authentication config.