github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +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
commit 610ab9a0db
6 changed files with 24 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/api/types.go
View File

@ -17,8 +17,6 @@ limitations under the License.
package api package api
import ( import (
"time"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util" "github.com/GoogleCloudPlatform/kubernetes/pkg/util"
) )
@ -363,7 +361,7 @@ type ContainerStateWaiting struct {
} }
type ContainerStateRunning struct { type ContainerStateRunning struct {
StartedAt time.Time `json:"startedAt,omitempty" yaml:"startedAt,omitempty"` StartedAt util.Time `json:"startedAt,omitempty" yaml:"startedAt,omitempty"`
} }
type ContainerStateTerminated struct { type ContainerStateTerminated struct {
@ -371,8 +369,8 @@ type ContainerStateTerminated struct {
Signal int `json:"signal,omitempty" yaml:"signal,omitempty"` Signal int `json:"signal,omitempty" yaml:"signal,omitempty"`
Reason string `json:"reason,omitempty" yaml:"reason,omitempty"` Reason string `json:"reason,omitempty" yaml:"reason,omitempty"`
Message string `json:"message,omitempty" yaml:"message,omitempty"` Message string `json:"message,omitempty" yaml:"message,omitempty"`
StartedAt time.Time `json:"startedAt,omitempty" yaml:"startedAt,omitempty"` StartedAt util.Time `json:"startedAt,omitempty" yaml:"startedAt,omitempty"`
FinishedAt time.Time `json:"finishedAt,omitempty" yaml:"finishedAt,omitempty"` FinishedAt util.Time `json:"finishedAt,omitempty" yaml:"finishedAt,omitempty"`
} }
// ContainerState holds a possible state of container. // ContainerState holds a possible state of container.

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

@ -17,8 +17,6 @@ limitations under the License.
package v1beta1 package v1beta1
import ( import (
"time"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util" "github.com/GoogleCloudPlatform/kubernetes/pkg/util"
) )
@ -328,8 +326,7 @@ type ContainerStateWaiting struct {
} }
type ContainerStateRunning struct { type ContainerStateRunning struct {
// TODO: change to util.Time StartedAt util.Time `json:"startedAt,omitempty" yaml:"startedAt,omitempty" description:"time at which the container was last (re-)started"`
StartedAt time.Time `json:"startedAt,omitempty" yaml:"startedAt,omitempty" description:"time at which the container was last (re-)started"`
} }
type ContainerStateTerminated struct { type ContainerStateTerminated struct {
@ -337,10 +334,8 @@ type ContainerStateTerminated struct {
Signal int `json:"signal,omitempty" yaml:"signal,omitempty" description:"signal from the last termination of the container"` Signal int `json:"signal,omitempty" yaml:"signal,omitempty" description:"signal from the last termination of the container"`
Reason string `json:"reason,omitempty" yaml:"reason,omitempty" description:"(brief) reason from the last termination of the container"` Reason string `json:"reason,omitempty" yaml:"reason,omitempty" description:"(brief) reason from the last termination of the container"`
Message string `json:"message,omitempty" yaml:"message,omitempty" description:"message regarding the last termination of the container"` Message string `json:"message,omitempty" yaml:"message,omitempty" description:"message regarding the last termination of the container"`
// TODO: change to util.Time StartedAt util.Time `json:"startedAt,omitempty" yaml:"startedAt,omitempty" description:"time at which previous execution of the container started"`
StartedAt time.Time `json:"startedAt,omitempty" yaml:"startedAt,omitempty" description:"time at which previous execution of the container started"` FinishedAt util.Time `json:"finishedAt,omitempty" yaml:"finishedAt,omitempty" description:"time at which the container last terminated"`
// TODO: change to util.Time
FinishedAt time.Time `json:"finishedAt,omitempty" yaml:"finishedAt,omitempty" description:"time at which the container last terminated"`
} }
// ContainerState holds a possible state of container. // ContainerState holds a possible state of container.

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

@ -17,8 +17,6 @@ limitations under the License.
package v1beta2 package v1beta2
import ( import (
"time"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util" "github.com/GoogleCloudPlatform/kubernetes/pkg/util"
) )
@ -293,8 +291,7 @@ type ContainerStateWaiting struct {
} }
type ContainerStateRunning struct { type ContainerStateRunning struct {
// TODO: change to util.Time StartedAt util.Time `json:"startedAt,omitempty" yaml:"startedAt,omitempty" description:"time at which the container was last (re-)started"`
StartedAt time.Time `json:"startedAt,omitempty" yaml:"startedAt,omitempty" description:"time at which the container was last (re-)started"`
} }
type ContainerStateTerminated struct { type ContainerStateTerminated struct {
@ -302,10 +299,8 @@ type ContainerStateTerminated struct {
Signal int `json:"signal,omitempty" yaml:"signal,omitempty" description:"signal from the last termination of the container"` Signal int `json:"signal,omitempty" yaml:"signal,omitempty" description:"signal from the last termination of the container"`
Reason string `json:"reason,omitempty" yaml:"reason,omitempty" description:"(brief) reason from the last termination of the container"` Reason string `json:"reason,omitempty" yaml:"reason,omitempty" description:"(brief) reason from the last termination of the container"`
Message string `json:"message,omitempty" yaml:"message,omitempty" description:"message regarding the last termination of the container"` Message string `json:"message,omitempty" yaml:"message,omitempty" description:"message regarding the last termination of the container"`
// TODO: change to util.Time StartedAt util.Time `json:"startedAt,omitempty" yaml:"startedAt,omitempty" description:"time at which previous execution of the container started"`
StartedAt time.Time `json:"startedAt,omitempty" yaml:"startedAt,omitempty" description:"time at which previous execution of the container started"` FinishedAt util.Time `json:"finishedAt,omitempty" yaml:"finishedAt,omitempty" description:"time at which the container last terminated"`
// TODO: change to util.Time
FinishedAt time.Time `json:"finishedAt,omitempty" yaml:"finishedAt,omitempty" description:"time at which the container last terminated"`
} }
// ContainerState holds a possible state of container. // ContainerState holds a possible state of container.

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

@ -17,8 +17,6 @@ limitations under the License.
package v1beta3 package v1beta3
import ( import (
"time"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util" "github.com/GoogleCloudPlatform/kubernetes/pkg/util"
) )
@ -392,7 +390,7 @@ type ContainerStateWaiting struct {
} }
type ContainerStateRunning struct { type ContainerStateRunning struct {
StartedAt time.Time `json:"startedAt,omitempty" yaml:"startedAt,omitempty"` StartedAt util.Time `json:"startedAt,omitempty" yaml:"startedAt,omitempty"`
} }
type ContainerStateTerminated struct { type ContainerStateTerminated struct {
@ -400,8 +398,8 @@ type ContainerStateTerminated struct {
Signal int `json:"signal,omitempty" yaml:"signal,omitempty"` Signal int `json:"signal,omitempty" yaml:"signal,omitempty"`
Reason string `json:"reason,omitempty" yaml:"reason,omitempty"` Reason string `json:"reason,omitempty" yaml:"reason,omitempty"`
Message string `json:"message,omitempty" yaml:"message,omitempty"` Message string `json:"message,omitempty" yaml:"message,omitempty"`
StartedAt time.Time `json:"startedAt,omitempty" yaml:"startedAt,omitempty"` StartedAt util.Time `json:"startedAt,omitempty" yaml:"startedAt,omitempty"`
FinishedAt time.Time `json:"finishedAt,omitempty" yaml:"finishedAt,omitempty"` FinishedAt util.Time `json:"finishedAt,omitempty" yaml:"finishedAt,omitempty"`
} }
// ContainerState holds a possible state of container. // ContainerState holds a possible state of container.

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

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

2
pkg/registry/pod/rest_test.go
View File

@ -578,7 +578,7 @@ func TestFillPodInfo(t *testing.T) {
"net": { "net": {
State: api.ContainerState{ State: api.ContainerState{
Running: &api.ContainerStateRunning{ Running: &api.ContainerStateRunning{
StartedAt: expectedTime, StartedAt: util.Time{expectedTime},
}, },
}, },
RestartCount: 1, RestartCount: 1,