github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages 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
import (
"time"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
)
@@ -361,7 +363,7 @@ type ContainerStateWaiting 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 {
@@ -369,8 +371,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 util.Time `json:"startedAt,omitempty" yaml:"startedAt,omitempty"`
FinishedAt util.Time `json:"finishedAt,omitempty" yaml:"finishedAt,omitempty"`
StartedAt time.Time `json:"startedAt,omitempty" yaml:"startedAt,omitempty"`
FinishedAt time.Time `json:"finishedAt,omitempty" yaml:"finishedAt,omitempty"`
}
// ContainerState holds a possible state of container.