From 1be4df6e025d265092237732ccc72c73191d419d Mon Sep 17 00:00:00 2001 From: Michal Wozniak Date: Thu, 18 Jul 2024 09:08:23 +0200 Subject: [PATCH] Cleanup Job controller isPodFailed function --- pkg/controller/job/job_controller.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkg/controller/job/job_controller.go b/pkg/controller/job/job_controller.go index 23dbb09b7d9..9f250c9a344 100644 --- a/pkg/controller/job/job_controller.go +++ b/pkg/controller/job/job_controller.go @@ -1901,16 +1901,11 @@ func ensureJobConditionStatus(list []batch.JobCondition, cType batch.JobConditio } 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 { return true } if onlyReplaceFailedPods(job) { - return p.Status.Phase == v1.PodFailed + return false } // Count deleted Pods as failures to account for orphan Pods that // never have a chance to reach the Failed phase.