github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #2632

pull/6/head
Dawn Chen 2014-12-19 17:06:41 -08:00
parent ba25ae49d7
commit bbaff08991
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/v1beta1/conversion.go
View File

@ -225,7 +225,7 @@ func init() {
case newer.PodRunning:
*out = PodRunning
case newer.PodSucceeded:
*out = PodTerminated
*out = PodSucceeded
case newer.PodFailed:
*out = PodTerminated
case newer.PodUnknown:
@ -248,6 +248,8 @@ func init() {
case PodTerminated:
// Older API versions did not contain enough info to map to PodSucceeded
*out = newer.PodFailed
case PodSucceeded:
*out = newer.PodSucceeded
case PodUnknown:
*out = newer.PodUnknown
default:

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

@ -317,10 +317,12 @@ const (
PodWaiting PodStatus = "Waiting"
// PodRunning means that the pod is up and running.
PodRunning PodStatus = "Running"
// PodTerminated means that the pod has stopped.
// PodTerminated means that the pod has stopped with error(s)
PodTerminated PodStatus = "Terminated"
// PodUnknown means that we failed to obtain info about the pod.
PodUnknown PodStatus = "Unknown"
// PodSucceeded means that the pod has stopped without error(s)
PodSucceeded PodStatus = "Succeeded"
)
type ContainerStateWaiting struct {

4
pkg/api/v1beta2/conversion.go
View File

@ -113,7 +113,7 @@ func init() {
case newer.PodRunning:
*out = PodRunning
case newer.PodSucceeded:
*out = PodTerminated
*out = PodSucceeded
case newer.PodFailed:
*out = PodTerminated
case newer.PodUnknown:
@ -136,6 +136,8 @@ func init() {
case PodTerminated:
// Older API versions did not contain enough info to map to PodSucceeded
*out = newer.PodFailed
case PodSucceeded:
*out = newer.PodSucceeded
case PodUnknown:
*out = newer.PodUnknown
default:

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

@ -286,6 +286,8 @@ const (
PodTerminated PodStatus = "Terminated"
// PodUnknown means that we failed to obtain info about the pod.
PodUnknown PodStatus = "Unknown"
// PodSucceeded means that the pod has stopped without error(s)
PodSucceeded PodStatus = "Succeeded"
)
type ContainerStateWaiting struct {