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

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

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