diff --git a/pkg/api/v1beta1/conversion.go b/pkg/api/v1beta1/conversion.go index 4586e5f2bc3..722a6134d91 100644 --- a/pkg/api/v1beta1/conversion.go +++ b/pkg/api/v1beta1/conversion.go @@ -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: diff --git a/pkg/api/v1beta1/types.go b/pkg/api/v1beta1/types.go index bd15388da61..22647d6d20f 100644 --- a/pkg/api/v1beta1/types.go +++ b/pkg/api/v1beta1/types.go @@ -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 { diff --git a/pkg/api/v1beta2/conversion.go b/pkg/api/v1beta2/conversion.go index 2d6d9442ded..8c92dea301e 100644 --- a/pkg/api/v1beta2/conversion.go +++ b/pkg/api/v1beta2/conversion.go @@ -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: diff --git a/pkg/api/v1beta2/types.go b/pkg/api/v1beta2/types.go index c8a33812462..35ea3ca2363 100644 --- a/pkg/api/v1beta2/types.go +++ b/pkg/api/v1beta2/types.go @@ -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 {