github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Fixed #2632

Browse Source
This commit is contained in:
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: case newer.PodRunning:
*out = PodRunning *out = PodRunning
case newer.PodSucceeded: case newer.PodSucceeded:
*out = PodTerminated *out = PodSucceeded
case newer.PodFailed: case newer.PodFailed:
*out = PodTerminated *out = PodTerminated
case newer.PodUnknown: case newer.PodUnknown:
@ -248,6 +248,8 @@ func init() {
case PodTerminated: case PodTerminated:
// Older API versions did not contain enough info to map to PodSucceeded // Older API versions did not contain enough info to map to PodSucceeded
*out = newer.PodFailed *out = newer.PodFailed
case PodSucceeded:
*out = newer.PodSucceeded
case PodUnknown: case PodUnknown:
*out = newer.PodUnknown *out = newer.PodUnknown
default: default:

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

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

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

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

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

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