Merge pull request #16277 from kargakis/cherry-pick

Automatic merge from submit-queue UPSTREAM: 52127: Fix deployment timeout reporting If the previous condition has been a successful rollout then we shouldn't try to estimate any progress. Scenario: * progressDeadlineSeconds is smaller than the difference between now and the time the last rollout finished in the past. * the creation of a new ReplicaSet triggers a resync of the Deployment prior to the cached copy of the Deployment getting updated with the status.condition that indicates the creation of the new ReplicaSet. The Deployment will be resynced and eventually its Progressing condition will catch up with the state of the world. Signed-off-by: Michail Kargakis <[email protected]> Cherry-pick of kubernetes/kubernetes#52127 /assign @mfojtik @tnozicka /area apps /kind bug
openshift · Sep 11, 2017 · 233358f · 233358f
2 parents 6109bc9 + 08520b5
commit 233358f
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/deployment/util/deployment_util.go b/vendor/k8s.io/kubernetes/pkg/controller/deployment/util/deployment_util.go
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/deployment/util/deployment_util_test.go b/vendor/k8s.io/kubernetes/pkg/controller/deployment/util/deployment_util_test.go