Skip to content

K
k3s
Commit bbaff089 authored by Dawn Chen's avatar Dawn Chen
Browse files
Options

Fixed #2632

parent ba25ae49
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 3 deletions
pkg/api/v1beta1/conversion.go
View file @ bbaff089
...@@ -225,7 +225,7 @@ func init() { ...@@ -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() { ...@@ -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:
......
pkg/api/v1beta1/types.go
View file @ bbaff089
...@@ -317,10 +317,12 @@ const ( ...@@ -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 {
......
pkg/api/v1beta2/conversion.go
View file @ bbaff089
...@@ -113,7 +113,7 @@ func init() { ...@@ -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() { ...@@ -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:
......
pkg/api/v1beta2/types.go
View file @ bbaff089
...@@ -286,6 +286,8 @@ const ( ...@@ -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 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment