github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #126190 from mimowo/job-controller-cleanup

Browse Source 
Cleanup Job controller isPodFailed function
This commit is contained in:
Kubernetes Prow Robot 2024-07-18 02:44:53 -07:00 committed by GitHub
commit 7693a7e71a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/controller/job/job_controller.go
View File

@ -1901,16 +1901,11 @@ func ensureJobConditionStatus(list []batch.JobCondition, cType batch.JobConditio
} }
func isPodFailed(p *v1.Pod, job *batch.Job) bool { func isPodFailed(p *v1.Pod, job *batch.Job) bool {
if job.Spec.PodFailurePolicy != nil {
// Orphan Pods and unschedulable terminating Pods are marked as Failed,
// so we only need to check the phase.
return p.Status.Phase == v1.PodFailed
}
if p.Status.Phase == v1.PodFailed { if p.Status.Phase == v1.PodFailed {
return true return true
} }
if onlyReplaceFailedPods(job) { if onlyReplaceFailedPods(job) {
return p.Status.Phase == v1.PodFailed return false
} }
// Count deleted Pods as failures to account for orphan Pods that // Count deleted Pods as failures to account for orphan Pods that
// never have a chance to reach the Failed phase. // never have a chance to reach the Failed phase.