Merge pull request #19672 from soltysh/issue62382

UPSTREAM: 63650: Never clean backoff in job controller
openshift · Jun 6, 2018 · 22c8c28 · 22c8c28
2 parents abd4806 + 19d7557
commit 22c8c28
Show file tree

Hide file tree

Showing 3 changed files with 158 additions and 16 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/job/job_controller.go b/vendor/k8s.io/kubernetes/pkg/controller/job/job_controller.go
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/job/job_controller_test.go b/vendor/k8s.io/kubernetes/pkg/controller/job/job_controller_test.go
diff --git a/vendor/k8s.io/kubernetes/test/e2e/apps/job.go b/vendor/k8s.io/kubernetes/test/e2e/apps/job.go