github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-27 04:21:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2808 from simon3z/master

Browse Source 
api: add container's id to ContainerStatus
This commit is contained in:
Dawn Chen 2014-12-10 16:30:08 -08:00
commit 5865ab750e
5 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/api/types.go
View File

@ -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://<container_id>'"`
}
// PodInfo contains one entry for every container with available info.

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

@ -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://<container_id>'"`
}
// PodInfo contains one entry for every container with available info.

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

@ -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://<container_id>'"`
}
// PodInfo contains one entry for every container with available info.

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

@ -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://<container_id>'"`
}
// PodInfo contains one entry for every container with available info.

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

@ -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