github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #67859 from goodluckbot/job-controller-backoffLimit 

Fix pastBackoffLimitOnFailure in job controller
pull/58/head
k8s-ci-robot 2018-10-11 05:49:30 -07:00 committed by GitHub
parent 8f620950e2 53c3e103d1
commit e6c5fb4666
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -643,6 +643,9 @@ func pastBackoffLimitOnFailure(job *batch.Job, pods []*v1.Pod) bool {
result += stat.RestartCount result += stat.RestartCount
} }
} }
if *job.Spec.BackoffLimit == 0 {
return result > 0
}
return result >= *job.Spec.BackoffLimit return result >= *job.Spec.BackoffLimit
} }

15
pkg/controller/job/job_controller_test.go
View File

@ -1422,6 +1422,21 @@ func TestJobBackoffForOnFailure(t *testing.T) {
expectedCondition *batch.JobConditionType expectedCondition *batch.JobConditionType
expectedConditionReason string expectedConditionReason string
}{ }{
"backoffLimit 0 should have 1 pod active": {
1, 1, 0,
true, []int32{0},
1, 0, 0, nil, "",
},
"backoffLimit 1 with restartCount 0 should have 1 pod active": {
1, 1, 1,
true, []int32{0},
1, 0, 0, nil, "",
},
"backoffLimit 1 with restartCount 1 should have 0 pod active": {
1, 1, 1,
true, []int32{1},
0, 0, 1, &jobConditionFailed, "BackoffLimitExceeded",
},
"too many job failures - single pod": { "too many job failures - single pod": {
1, 5, 2, 1, 5, 2,
true, []int32{2}, true, []int32{2},