diff --git a/pkg/api/types.go b/pkg/api/types.go index cd1b40c75b8..2b719218b63 100644 --- a/pkg/api/types.go +++ b/pkg/api/types.go @@ -405,7 +405,8 @@ type ContainerStatus struct { // not just PodInfo. Now we need this to remove docker.Container from API PodIP string `json:"podIP,omitempty"` // TODO(dchen1107): Need to decide how to represent this in v1beta3 - Image string `json:"image"` + Image string `json:"image"` + ContainerID string `json:"containerID,omitempty" description:"container's ID in the format 'docker://'"` } // PodInfo contains one entry for every container with available info. diff --git a/pkg/api/v1beta1/types.go b/pkg/api/v1beta1/types.go index 9780468d1db..c575a1d6be4 100644 --- a/pkg/api/v1beta1/types.go +++ b/pkg/api/v1beta1/types.go @@ -364,7 +364,8 @@ type ContainerStatus struct { // not just PodInfo. Now we need this to remove docker.Container from API PodIP string `json:"podIP,omitempty" description:"pod's IP address"` // TODO(dchen1107): Need to decide how to reprensent this in v1beta3 - Image string `json:"image" description:"image of the container"` + Image string `json:"image" description:"image of the container"` + ContainerID string `json:"containerID,omitempty" description:"container's ID in the format 'docker://'"` } // PodInfo contains one entry for every container with available info. diff --git a/pkg/api/v1beta2/types.go b/pkg/api/v1beta2/types.go index 42da500ed6d..9931943d1fc 100644 --- a/pkg/api/v1beta2/types.go +++ b/pkg/api/v1beta2/types.go @@ -329,7 +329,8 @@ type ContainerStatus struct { // not just PodInfo. Now we need this to remove docker.Container from API PodIP string `json:"podIP,omitempty" description:"pod's IP address"` // TODO(dchen1107): Need to decide how to reprensent this in v1beta3 - Image string `json:"image" description:"image of the container"` + Image string `json:"image" description:"image of the container"` + ContainerID string `json:"containerID,omitempty" description:"container's ID in the format 'docker://'"` } // PodInfo contains one entry for every container with available info. diff --git a/pkg/api/v1beta3/types.go b/pkg/api/v1beta3/types.go index 320301fe474..bfbafbdee96 100644 --- a/pkg/api/v1beta3/types.go +++ b/pkg/api/v1beta3/types.go @@ -423,6 +423,7 @@ type ContainerStatus struct { RestartCount int `json:"restartCount"` // TODO(dchen1107): Introduce our own NetworkSettings struct here? // TODO(dchen1107): Which image the container is running with? + ContainerID string `json:"containerID,omitempty" description:"container's ID in the format 'docker://'"` } // PodInfo contains one entry for every container with available info. diff --git a/pkg/kubelet/dockertools/docker.go b/pkg/kubelet/dockertools/docker.go index 3b26f73458d..b69cf0ae10c 100644 --- a/pkg/kubelet/dockertools/docker.go +++ b/pkg/kubelet/dockertools/docker.go @@ -389,7 +389,8 @@ func inspectContainer(client DockerInterface, dockerID, containerName, tPath str glog.V(3).Infof("Container inspect result: %+v", *inspectResult) containerStatus := api.ContainerStatus{ - Image: inspectResult.Config.Image, + Image: inspectResult.Config.Image, + ContainerID: "docker://" + dockerID, } waiting := true