dockershim: Return Labels as Info in ImageStatus.

c6ddc749 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.

dockershim: Return Labels as Info in ImageStatus.
48af7398 · Shea Levy · Shea Levy · eff9f75f · 48af7398
Unverified Commit 48af7398 authored Feb 07, 2018 by Shea Levy Committed by Shea Levy Feb 23, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

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

No files found.
--- 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.