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.

Sign up for GitHub

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

Jump to bottom

Remove patch retry conflict detection #66169

Merged
merged 1 commit into from
Jul 21, 2018
Merged

Remove patch retry conflict detection #66169

merged 1 commit into from
Jul 21, 2018

Conversation

liggitt
Copy link
Member

@liggitt liggitt commented Jul 13, 2018 •
edited
Loading

Minimal backport of #63146
Fixes #58002

Fixes spurious patch errors for CRDs
Fixes patch errors for nodes when the watch cache has a persistently stale version of an object

fixes spurious "meaningful conflict" error encountered by nodes attempting to update status, which could cause them to be considered unready

@liggitt
Remove patch retry conflict detection
d8cac18 
Minimal backport of kubernetes#63146

Fixes spurious patch errors for CRDs
Fixes patch errors for nodes when the watch cache has a persistently stale version of an object
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jul 13, 2018
@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 13, 2018
@k8s-github-robot k8s-github-robot added the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Jul 13, 2018
@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Jul 13, 2018
@liggitt
Copy link
Member Author

liggitt commented Jul 13, 2018

/sig api-machinery
/kind bug
/milestone 1.10
/priority important-soon
/assign @MaciekPytel

@k8s-ci-robot
Copy link
Contributor

@liggitt: The provided milestone is not valid for this repository. Milestones in this repository: [next-candidate, v1.10, v1.11, v1.12, v1.13, v1.4, v1.5, v1.6, v1.7, v1.8, v1.9]

Use /milestone clear to clear the milestone.

In response to this:

/sig api-machinery
/kind bug
/milestone 1.10
/priority important-soon
/assign @MaciekPytel

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.

@k8s-ci-robot k8s-ci-robot added sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. kind/bug Categorizes issue or PR as related to a bug. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. labels Jul 13, 2018
@liggitt
Copy link
Member Author

liggitt commented Jul 13, 2018

/retest

@MaciekPytel MaciekPytel added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. labels Jul 17, 2018
@fedebongio
Copy link
Contributor

/cc @mbohlool

@MaciekPytel
Copy link
Contributor

@liggitt @mbohlool Does this need to go out in 1.10.6? If so please lgtm today, otherwise let's merge it for 1.10.7.

@liggitt
Copy link
Member Author

liggitt commented Jul 20, 2018

it's not urgent

@mbohlool
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 20, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: liggitt, mbohlool

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

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@nikhita
Copy link
Member

nikhita commented Jul 21, 2018

/retest

@k8s-github-robot
Copy link

/test all [submit-queue is verifying that this PR is safe to merge]

@k8s-github-robot
Copy link

Automatic merge from submit-queue.

@k8s-github-robot k8s-github-robot merged commit 631b766 into kubernetes:release-1.10 Jul 21, 2018
@liggitt liggitt mentioned this pull request Aug 14, 2018
Merged
@liggitt liggitt deleted the patch-retry-1.10 branch April 22, 2019 15:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@smarterclayton smarterclayton Awaiting requested review from smarterclayton

@tallclair tallclair Awaiting requested review from tallclair

@mbohlool mbohlool Awaiting requested review from mbohlool

Assignees

@mbohlool mbohlool

@MaciekPytel MaciekPytel

@deads2k deads2k

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@liggitt @k8s-ci-robot @fedebongio @MaciekPytel @mbohlool @nikhita @k8s-github-robot @deads2k