github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-10 12:32:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5809 from dchen1107/podstatus

Browse Source 
Introduced LastTerminateState to ContainerStatus
This commit is contained in:
Saad Ali 2015-03-24 07:42:24 -07:00
commit 2a88c77522
4 changed files with 39 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/types.go
View File

@ -463,6 +463,7 @@ type ContainerStateTerminated struct {
Message string `json:"message,omitempty"` Message string `json:"message,omitempty"`
StartedAt util.Time `json:"startedAt,omitempty"` StartedAt util.Time `json:"startedAt,omitempty"`
FinishedAt util.Time `json:"finishedAt,omitempty"` FinishedAt util.Time `json:"finishedAt,omitempty"`
ContainerID string `json:"containerID,omitempty"`
} }
// ContainerState holds a possible state of container. // ContainerState holds a possible state of container.
@ -478,6 +479,7 @@ type ContainerStatus struct {
// TODO(dchen1107): Should we rename PodStatus to a more generic name or have a separate states // TODO(dchen1107): Should we rename PodStatus to a more generic name or have a separate states
// defined for container? // defined for container?
State ContainerState `json:"state,omitempty"` State ContainerState `json:"state,omitempty"`
LastTerminationState ContainerState `json:"lastState,omitempty"`
// Ready specifies whether the conatiner has passed its readiness check. // Ready specifies whether the conatiner has passed its readiness check.
Ready bool `json:"ready"` Ready bool `json:"ready"`
// Note that this is calculated from dead containers. But those containers are subject to // Note that this is calculated from dead containers. But those containers are subject to

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

@ -431,6 +431,7 @@ type ContainerStateTerminated struct {
Message string `json:"message,omitempty" description:"message regarding the last termination of the container"` Message string `json:"message,omitempty" description:"message regarding the last termination of the container"`
StartedAt util.Time `json:"startedAt,omitempty" description:"time at which previous execution of the container started"` StartedAt util.Time `json:"startedAt,omitempty" description:"time at which previous execution of the container started"`
FinishedAt util.Time `json:"finishedAt,omitempty" description:"time at which the container last terminated"` FinishedAt util.Time `json:"finishedAt,omitempty" description:"time at which the container last terminated"`
ContainerID string `json:"containerID,omitempty" description:"container's ID in the format 'docker://<container_id>'"`
} }
// ContainerState holds a possible state of container. // ContainerState holds a possible state of container.
@ -446,6 +447,7 @@ type ContainerStatus struct {
// TODO(dchen1107): Should we rename PodStatus to a more generic name or have a separate states // TODO(dchen1107): Should we rename PodStatus to a more generic name or have a separate states
// defined for container? // defined for container?
State ContainerState `json:"state,omitempty" description:"details about the container's current condition"` State ContainerState `json:"state,omitempty" description:"details about the container's current condition"`
LastTerminationState ContainerState `json:"lastState,omitempty" description:"details about the container's last termination condition"`
Ready bool `json:"ready" description:"specifies whether the container has passed its readiness probe"` Ready bool `json:"ready" description:"specifies whether the container has passed its readiness probe"`
// Note that this is calculated from dead containers. But those containers are subject to // Note that this is calculated from dead containers. But those containers are subject to
// garbage collection. This value will get capped at 5 by GC. // garbage collection. This value will get capped at 5 by GC.

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

@ -428,6 +428,7 @@ type ContainerStateTerminated struct {
Message string `json:"message,omitempty" description:"message regarding the last termination of the container"` Message string `json:"message,omitempty" description:"message regarding the last termination of the container"`
StartedAt util.Time `json:"startedAt,omitempty" description:"time at which previous execution of the container started"` StartedAt util.Time `json:"startedAt,omitempty" description:"time at which previous execution of the container started"`
FinishedAt util.Time `json:"finishedAt,omitempty" description:"time at which the container last terminated"` FinishedAt util.Time `json:"finishedAt,omitempty" description:"time at which the container last terminated"`
ContainerID string `json:"containerID,omitempty" description:"container's ID in the format 'docker://<container_id>'"`
} }
// ContainerState holds a possible state of container. // ContainerState holds a possible state of container.
@ -443,6 +444,7 @@ type ContainerStatus struct {
// TODO(dchen1107): Should we rename PodStatus to a more generic name or have a separate states // TODO(dchen1107): Should we rename PodStatus to a more generic name or have a separate states
// defined for container? // defined for container?
State ContainerState `json:"state,omitempty" description:"details about the container's current condition"` State ContainerState `json:"state,omitempty" description:"details about the container's current condition"`
LastTerminationState ContainerState `json:"lastState,omitempty" description:"details about the container's last termination condition"`
Ready bool `json:"ready" description:"specifies whether the container has passed its readiness probe"` Ready bool `json:"ready" description:"specifies whether the container has passed its readiness probe"`
// Note that this is calculated from dead containers. But those containers are subject to // Note that this is calculated from dead containers. But those containers are subject to
// garbage collection. This value will get capped at 5 by GC. // garbage collection. This value will get capped at 5 by GC.

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

@ -475,6 +475,7 @@ type ContainerStateTerminated struct {
Message string `json:"message,omitempty" description:"message regarding the last termination of the container"` Message string `json:"message,omitempty" description:"message regarding the last termination of the container"`
StartedAt util.Time `json:"startedAt,omitempty" description:"time at which previous execution of the container started"` StartedAt util.Time `json:"startedAt,omitempty" description:"time at which previous execution of the container started"`
FinishedAt util.Time `json:"finishedAt,omitempty" description:"time at which the container last terminated"` FinishedAt util.Time `json:"finishedAt,omitempty" description:"time at which the container last terminated"`
ContainerID string `json:"containerID,omitempty" description:"container's ID in the format 'docker://<container_id>'"`
} }
// ContainerState holds a possible state of container. // ContainerState holds a possible state of container.
@ -490,6 +491,7 @@ type ContainerStatus struct {
// TODO(dchen1107): Should we rename PodStatus to a more generic name or have a separate states // TODO(dchen1107): Should we rename PodStatus to a more generic name or have a separate states
// defined for container? // defined for container?
State ContainerState `json:"state,omitempty" description:"details about the container's current condition"` State ContainerState `json:"state,omitempty" description:"details about the container's current condition"`
LastTerminationState ContainerState `json:"lastState,omitempty" description:"details about the container's last termination condition"`
Ready bool `json:"ready" description:"specifies whether the container has passed its readiness probe"` Ready bool `json:"ready" description:"specifies whether the container has passed its readiness probe"`
// Note that this is calculated from dead containers. But those containers are subject to // Note that this is calculated from dead containers. But those containers are subject to
// garbage collection. This value will get capped at 5 by GC. // garbage collection. This value will get capped at 5 by GC.