Skip to content

Commit 233358f

Browse files
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
2 parents 6109bc9 + 08520b5 commit 233358f

File tree

2 files changed

+25
-4
lines changed

2 files changed

+25
-4
lines changed

vendor/k8s.io/kubernetes/pkg/controller/deployment/util/deployment_util.go

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/kubernetes/pkg/controller/deployment/util/deployment_util_test.go

Lines changed: 11 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)