From 55f09009c74e3d28185fa9c94703746e9424e0e3 Mon Sep 17 00:00:00 2001 From: Derek Parker Date: Mon, 11 Jan 2016 17:54:42 -0800 Subject: [PATCH] rkt: Include size in ListImages --- pkg/kubelet/rkt/image.go | 2 +- pkg/kubelet/rkt/rkt_test.go | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/kubelet/rkt/image.go b/pkg/kubelet/rkt/image.go index 54e5ff231e5..2a949042ea7 100644 --- a/pkg/kubelet/rkt/image.go +++ b/pkg/kubelet/rkt/image.go @@ -88,7 +88,7 @@ func (r *Runtime) ListImages() ([]kubecontainer.Image, error) { images[i] = kubecontainer.Image{ ID: image.Id, RepoTags: []string{buildImageName(image)}, - //TODO: fill in the size of the image + Size: image.Size, } } return images, nil diff --git a/pkg/kubelet/rkt/rkt_test.go b/pkg/kubelet/rkt/rkt_test.go index 2be0f976ecb..5bece7edcb9 100644 --- a/pkg/kubelet/rkt/rkt_test.go +++ b/pkg/kubelet/rkt/rkt_test.go @@ -294,21 +294,25 @@ func TestListImages(t *testing.T) { Id: "sha512-a2fb8f390702", Name: "quay.io/coreos/alpine-sh", Version: "latest", + Size: 400, }, { Id: "sha512-c6b597f42816", Name: "coreos.com/rkt/stage1-coreos", Version: "0.10.0", + Size: 400, }, }, []kubecontainer.Image{ { ID: "sha512-a2fb8f390702", RepoTags: []string{"quay.io/coreos/alpine-sh:latest"}, + Size: 400, }, { ID: "sha512-c6b597f42816", RepoTags: []string{"coreos.com/rkt/stage1-coreos:0.10.0"}, + Size: 400, }, }, },