Merge pull request #58036 from shlevy/cri-ImageStatus-info

Automatic merge from submit-queue (batch tested with PRs 58171, 58036, 60540). 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>. 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. **What this PR does / why we need it**: This PR exposes an image's `Labels` through the CRI. In particular, I want this so I can write an `ImageService` wrapper that delegates all operations to a real `ImageService` but also, when the right `Labels`, ensures any needed [nix store](https://nixos.org/nix/) paths are present on the system when an image is pulled, enabling users to use nix for package distribution while still using containers for isolation and kubernetes for orchestration. In general, though, this should be useful for anything that wants to know about an image's `Labels` **Special notes for your reviewer**: I'd prefer to put this change into the `Image` protobuf type instead of putting it into `Info` (gated by `Verbose` or not, available in other requests like `ListImages` or not), but that would be a change to the protocol and it seems `Info` was introduced exactly for this purpose. If it's acceptable to put this into `Image`, I'll rework this. If this change is acceptable, I will also do the work for `cri-o`, `rktlet`, `frakti`, and `cri-containerd` where applicable. I have started the process for my employer to sign on to the CLA. I don't have reason to expect it to take long, but because there is more work to do if this change is desired I'd prefer if we can start review before that is completed. **Release note**: ```release-note dockershim now makes an Image's Labels available in the Info field of ImageStatusResponse ```

Merge pull request #58036 from shlevy/cri-ImageStatus-info
b63fab3a · Kubernetes Submit Queue · GitHub · 74a7f989 · 48af7398 · b63fab3a
Unverified Commit b63fab3a authored Feb 28, 2018 by Kubernetes Submit Queue Committed by GitHub Feb 28, 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.