diff --git a/pkg/kubelet/dockershim/convert.go b/pkg/kubelet/dockershim/convert.go index 32297564270..4ba1e493707 100644 --- a/pkg/kubelet/dockershim/convert.go +++ b/pkg/kubelet/dockershim/convert.go @@ -56,14 +56,16 @@ func toRuntimeAPIContainer(c *dockertypes.Container) (*runtimeApi.Container, err return nil, err } labels, annotations := extractLabels(c.Labels) + sandboxID := c.Labels[sandboxIDLabelKey] return &runtimeApi.Container{ - Id: &c.ID, - Metadata: metadata, - Image: &runtimeApi.ImageSpec{Image: &c.Image}, - ImageRef: &c.ImageID, - State: &state, - Labels: labels, - Annotations: annotations, + Id: &c.ID, + PodSandboxId: &sandboxID, + Metadata: metadata, + Image: &runtimeApi.ImageSpec{Image: &c.Image}, + ImageRef: &c.ImageID, + State: &state, + Labels: labels, + Annotations: annotations, }, nil } diff --git a/pkg/kubelet/dockershim/docker_container_test.go b/pkg/kubelet/dockershim/docker_container_test.go index 3e5f6e82dd4..4885441e6e4 100644 --- a/pkg/kubelet/dockershim/docker_container_test.go +++ b/pkg/kubelet/dockershim/docker_container_test.go @@ -73,13 +73,14 @@ func TestListContainers(t *testing.T) { // Prepend to the expected list because ListContainers returns // the most recent containers first. expected = append([]*runtimeApi.Container{{ - Metadata: configs[i].Metadata, - Id: &id, - State: &state, - Image: configs[i].Image, - ImageRef: &imageRef, - Labels: configs[i].Labels, - Annotations: configs[i].Annotations, + Metadata: configs[i].Metadata, + Id: &id, + PodSandboxId: &sandboxID, + State: &state, + Image: configs[i].Image, + ImageRef: &imageRef, + Labels: configs[i].Labels, + Annotations: configs[i].Annotations, }}, expected...) } containers, err := ds.ListContainers(nil)