github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug in dockershim to set sandbox id properly.

Browse Source
This commit is contained in:
Random-Liu
2016-10-01 20:55:06 -07:00
parent 56be1976fc
commit 37273693e5
2 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/dockershim/convert.go
View File

@@ -56,8 +56,10 @@ func toRuntimeAPIContainer(c *dockertypes.Container) (*runtimeApi.Container, err
return nil, err return nil, err
} }
labels, annotations := extractLabels(c.Labels) labels, annotations := extractLabels(c.Labels)
sandboxID := c.Labels[sandboxIDLabelKey]
return &runtimeApi.Container{ return &runtimeApi.Container{
Id: &c.ID, Id: &c.ID,
PodSandboxId: &sandboxID,
Metadata: metadata, Metadata: metadata,
Image: &runtimeApi.ImageSpec{Image: &c.Image}, Image: &runtimeApi.ImageSpec{Image: &c.Image},
ImageRef: &c.ImageID, ImageRef: &c.ImageID,

1
pkg/kubelet/dockershim/docker_container_test.go
View File

@@ -75,6 +75,7 @@ func TestListContainers(t *testing.T) {
expected = append([]*runtimeApi.Container{{ expected = append([]*runtimeApi.Container{{
Metadata: configs[i].Metadata, Metadata: configs[i].Metadata,
Id: &id, Id: &id,
PodSandboxId: &sandboxID,
State: &state, State: &state,
Image: configs[i].Image, Image: configs[i].Image,
ImageRef: &imageRef, ImageRef: &imageRef,