Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UPSTREAM: 52127: Fix deployment timeout reporting #16277

Merged
merged 1 commit into from
Sep 11, 2017
Merged

UPSTREAM: 52127: Fix deployment timeout reporting #16277

merged 1 commit into from
Sep 11, 2017

Conversation

0xmichalis
Copy link
Contributor

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

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]>
@openshift-ci-robot openshift-ci-robot added the kind/bug Categorizes issue or PR as related to a bug. label Sep 11, 2017
@openshift-merge-robot openshift-merge-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 11, 2017
@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Sep 11, 2017
@mfojtik
Copy link
Contributor

mfojtik commented Sep 11, 2017

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 11, 2017
@openshift-merge-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kargakis, mfojtik

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@0xmichalis
Copy link
Contributor Author

flake: #15988

@0xmichalis
Copy link
Contributor Author

/retest

@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue

@openshift-merge-robot openshift-merge-robot merged commit 233358f into openshift:master Sep 11, 2017
@0xmichalis 0xmichalis deleted the cherry-pick branch September 11, 2017 12:41
@0xmichalis
Copy link
Contributor Author

/cherrypick release-3.6

@openshift-cherrypick-robot

@Kargakis: New pull request created: #17148

In response to this:

/cherrypick release-3.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. retest-not-required size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants