Merge pull request #18760 from mfojtik/pick-60301

UPSTREAM: 60301: Fix Deployment with Recreate strategy not to wait on pods in terminal phase
openshift · Feb 27, 2018 · f48a8cf · f48a8cf
2 parents 9e7dc61 + d6fc815
commit f48a8cf
Show file tree

Hide file tree

Showing 2 changed files with 134 additions and 18 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/deployment/recreate.go b/vendor/k8s.io/kubernetes/pkg/controller/deployment/recreate.go
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/deployment/recreate_test.go b/vendor/k8s.io/kubernetes/pkg/controller/deployment/recreate_test.go