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

Revert "Using util.Time for ContainerStatus"

Browse Source
This commit is contained in:
Brendan Burns
2014-11-24 21:32:31 -08:00
parent fa84b621cc
commit a5bc6301a4
6 changed files with 38 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/api/types.go
View File

@@ -17,6 +17,8 @@ limitations under the License.
package api package api
import ( import (
"time"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util" "github.com/GoogleCloudPlatform/kubernetes/pkg/util"
) )
@@ -361,7 +363,7 @@ type ContainerStateWaiting struct {
} }
type ContainerStateRunning struct { type ContainerStateRunning struct {
StartedAt util.Time `json:"startedAt,omitempty" yaml:"startedAt,omitempty"` StartedAt time.Time `json:"startedAt,omitempty" yaml:"startedAt,omitempty"`
} }
type ContainerStateTerminated struct { type ContainerStateTerminated struct {
@@ -369,8 +371,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 util.Time `json:"startedAt,omitempty" yaml:"startedAt,omitempty"` StartedAt time.Time `json:"startedAt,omitempty" yaml:"startedAt,omitempty"`
FinishedAt util.Time `json:"finishedAt,omitempty" yaml:"finishedAt,omitempty"` FinishedAt time.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,6 +17,8 @@ limitations under the License.
package v1beta1 package v1beta1
import ( import (
"time"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util" "github.com/GoogleCloudPlatform/kubernetes/pkg/util"
) )
@@ -326,7 +328,8 @@ type ContainerStateWaiting struct {
} }
type ContainerStateRunning struct { type ContainerStateRunning struct {
StartedAt util.Time `json:"startedAt,omitempty" yaml:"startedAt,omitempty" description:"time at which the container was last (re-)started"` // TODO: change to util.Time
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 {
@@ -334,8 +337,10 @@ 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"`
StartedAt util.Time `json:"startedAt,omitempty" yaml:"startedAt,omitempty" description:"time at which previous execution of the container started"` // TODO: change to util.Time
FinishedAt util.Time `json:"finishedAt,omitempty" yaml:"finishedAt,omitempty" description:"time at which the container last terminated"` StartedAt time.Time `json:"startedAt,omitempty" yaml:"startedAt,omitempty" description:"time at which previous execution of the container started"`
// 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,6 +17,8 @@ limitations under the License.
package v1beta2 package v1beta2
import ( import (
"time"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util" "github.com/GoogleCloudPlatform/kubernetes/pkg/util"
) )
@@ -291,7 +293,8 @@ type ContainerStateWaiting struct {
} }
type ContainerStateRunning struct { type ContainerStateRunning struct {
StartedAt util.Time `json:"startedAt,omitempty" yaml:"startedAt,omitempty" description:"time at which the container was last (re-)started"` // TODO: change to util.Time
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 {
@@ -299,8 +302,10 @@ 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"`
StartedAt util.Time `json:"startedAt,omitempty" yaml:"startedAt,omitempty" description:"time at which previous execution of the container started"` // TODO: change to util.Time
FinishedAt util.Time `json:"finishedAt,omitempty" yaml:"finishedAt,omitempty" description:"time at which the container last terminated"` StartedAt time.Time `json:"startedAt,omitempty" yaml:"startedAt,omitempty" description:"time at which previous execution of the container started"`
// 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,6 +17,8 @@ limitations under the License.
package v1beta3 package v1beta3
import ( import (
"time"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util" "github.com/GoogleCloudPlatform/kubernetes/pkg/util"
) )
@@ -390,7 +392,7 @@ type ContainerStateWaiting struct {
} }
type ContainerStateRunning struct { type ContainerStateRunning struct {
StartedAt util.Time `json:"startedAt,omitempty" yaml:"startedAt,omitempty"` StartedAt time.Time `json:"startedAt,omitempty" yaml:"startedAt,omitempty"`
} }
type ContainerStateTerminated struct { type ContainerStateTerminated struct {
@@ -398,8 +400,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 util.Time `json:"startedAt,omitempty" yaml:"startedAt,omitempty"` StartedAt time.Time `json:"startedAt,omitempty" yaml:"startedAt,omitempty"`
FinishedAt util.Time `json:"finishedAt,omitempty" yaml:"finishedAt,omitempty"` FinishedAt time.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: util.Time{inspectResult.State.StartedAt}, StartedAt: 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: util.Time{inspectResult.State.StartedAt}, StartedAt: inspectResult.State.StartedAt,
FinishedAt: util.Time{inspectResult.State.FinishedAt}, FinishedAt: 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: util.Time{expectedTime}, StartedAt: expectedTime,
}, },
}, },
RestartCount: 1, RestartCount: 1,