github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4191 from simon3z/master

Browse Source 
api: add image's id to ContainerStatus
This commit is contained in:
Dawn Chen 2015-02-06 09:35:44 -08:00
commit 05de54249f
5 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/api/types.go
View File

@ -442,6 +442,7 @@ type ContainerStatus struct {
PodIP string `json:"podIP,omitempty"` PodIP string `json:"podIP,omitempty"`
// TODO(dchen1107): Need to decide how to represent this in v1beta3 // TODO(dchen1107): Need to decide how to represent this in v1beta3
Image string `json:"image"` Image string `json:"image"`
ImageID string `json:"imageID" description:"ID of the container's image"`
ContainerID string `json:"containerID,omitempty" description:"container's ID in the format 'docker://<container_id>'"` ContainerID string `json:"containerID,omitempty" description:"container's ID in the format 'docker://<container_id>'"`
} }

1
pkg/api/v1beta1/types.go
View File

@ -408,6 +408,7 @@ type ContainerStatus struct {
PodIP string `json:"podIP,omitempty" description:"pod's IP address"` PodIP string `json:"podIP,omitempty" description:"pod's IP address"`
// TODO(dchen1107): Need to decide how to reprensent this in v1beta3 // 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"`
ImageID string `json:"imageID" description:"ID of the container's image"`
ContainerID string `json:"containerID,omitempty" description:"container's ID in the format 'docker://<container_id>'"` ContainerID string `json:"containerID,omitempty" description:"container's ID in the format 'docker://<container_id>'"`
} }

1
pkg/api/v1beta2/types.go
View File

@ -372,6 +372,7 @@ type ContainerStatus struct {
PodIP string `json:"podIP,omitempty" description:"pod's IP address"` PodIP string `json:"podIP,omitempty" description:"pod's IP address"`
// TODO(dchen1107): Need to decide how to reprensent this in v1beta3 // 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"`
ImageID string `json:"imageID" description:"ID of the container's image"`
ContainerID string `json:"containerID,omitempty" description:"container's ID in the format 'docker://<container_id>'"` ContainerID string `json:"containerID,omitempty" description:"container's ID in the format 'docker://<container_id>'"`
} }

3
pkg/api/v1beta3/types.go
View File

@ -464,7 +464,8 @@ type ContainerStatus struct {
PodIP string `json:"podIP,omitempty"` PodIP string `json:"podIP,omitempty"`
// TODO(dchen1107): Which image the container is running with? // TODO(dchen1107): Which image the container is running with?
// The image the container is running // The image the container is running
Image string `json:"image"` Image string `json:"image"`
ImageID string `json:"imageID" description:"ID of the container's image"`
} }
// PodInfo contains one entry for every container with available info. // PodInfo contains one entry for every container with available info.

4
pkg/kubelet/dockertools/docker.go
View File

@ -41,6 +41,7 @@ import (
const ( const (
PodInfraContainerName = leaky.PodInfraContainerName PodInfraContainerName = leaky.PodInfraContainerName
DockerPrefix = "docker://"
) )
// DockerInterface is an abstract interface for testability. It abstracts the interface of docker.Client. // DockerInterface is an abstract interface for testability. It abstracts the interface of docker.Client.
@ -399,7 +400,8 @@ func inspectContainer(client DockerInterface, dockerID, containerName, tPath str
glog.V(3).Infof("Container inspect result: %+v", *inspectResult) glog.V(3).Infof("Container inspect result: %+v", *inspectResult)
containerStatus := api.ContainerStatus{ containerStatus := api.ContainerStatus{
Image: inspectResult.Config.Image, Image: inspectResult.Config.Image,
ContainerID: "docker://" + dockerID, ImageID: DockerPrefix + inspectResult.Image,
ContainerID: DockerPrefix + dockerID,
} }
waiting := true waiting := true