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

Merge pull request #2586 from dchen1107/cleanup

Browse Source 
Using util.Time for ContainerStatus
This commit is contained in:
Daniel Smith
2014-11-24 15:35:07 -08:00
parent 668a81e894 acb0f1198b
commit 610ab9a0db
6 changed files with 24 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -387,7 +387,7 @@ func inspectContainer(client DockerInterface, dockerID, containerName, tPath str
waiting := true
if inspectResult.State.Running {
containerStatus.State.Running = &api.ContainerStateRunning{
StartedAt: inspectResult.State.StartedAt,
StartedAt: util.Time{inspectResult.State.StartedAt},
}
if containerName == "net" && inspectResult.NetworkSettings != nil {
containerStatus.PodIP = inspectResult.NetworkSettings.IPAddress
@@ -398,8 +398,8 @@ func inspectContainer(client DockerInterface, dockerID, containerName, tPath str
containerStatus.State.Termination = &api.ContainerStateTerminated{
ExitCode: inspectResult.State.ExitCode,
Reason: "",
StartedAt: inspectResult.State.StartedAt,
FinishedAt: inspectResult.State.FinishedAt,
StartedAt: util.Time{inspectResult.State.StartedAt},
FinishedAt: util.Time{inspectResult.State.FinishedAt},
}
if tPath != "" {
path, found := inspectResult.Volumes[tPath]