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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

馃悰 fakeClient.Status().Update(...) cannot recognize resource version conflicts #2365

Merged
merged 1 commit into from Jun 11, 2023
Merged

馃悰 fakeClient.Status().Update(...) cannot recognize resource version conflicts #2365

merged 1 commit into from Jun 11, 2023

Conversation

iiiceoo
Copy link
Contributor

@iiiceoo iiiceoo commented May 31, 2023 •
edited

The fake client of subresource is unable to correctly handle the case of resource version conflict when updating. The phenomenon is that it did not return a 409 status error.

Ref:
#2362

Signed-off-by: iiiceoo iiiceoo@foxmail.com

@k8s-ci-robot k8s-ci-robot added do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels May 31, 2023
@k8s-ci-robot
Copy link
Contributor

Welcome @iiiceoo!

It looks like this is your first PR to kubernetes-sigs/controller-runtime 馃帀. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/controller-runtime has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 馃槂

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label May 31, 2023
@k8s-ci-robot
Copy link
Contributor

Hi @iiiceoo. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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 the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label May 31, 2023
@iiiceoo iiiceoo changed the title 馃悰 fakeClient.Status().Update(...) cannot recognize resource version conflicts 馃悰 fakeClient.Status().Update(...) cannot recognize resource version conflicts May 31, 2023
@iiiceoo iiiceoo force-pushed the fix-rv branch 2 times, most recently from d505e4b to 9c93dc1 Compare May 31, 2023 10:38
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. label May 31, 2023
@iiiceoo
Copy link
Contributor Author

iiiceoo commented May 31, 2023

/cc @FillZpp

@FillZpp
Copy link
Contributor

FillZpp commented Jun 1, 2023

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 1, 2023
@FillZpp
Copy link
Contributor

FillZpp commented Jun 1, 2023

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 1, 2023
alvaroaleman
alvaroaleman reviewed Jun 1, 2023
View reviewed changes
pkg/client/fake/client.go
if err := fromMapStringAny(newMapStringAny, new); err != nil {
return fmt.Errorf("failed to convert back from map[string]any: %w", err)
}
newClientObject.SetResourceVersion(rv)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a testcase

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I just noticed this message and I will complete it as soon as possible.

@iiiceoo
馃悰 fakeClient.Status().Update(...) cannot recognize resource version
6c14198 
conflicts

The fake client of subresource is unable to correctly handle the case of
resource version conflict when updating. The phenomenon is that it did
not return a 409 status error.

Signed-off-by: iiiceoo <iiiceoo@foxmail.com>
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 2, 2023
@iiiceoo
Copy link
Contributor Author

iiiceoo commented Jun 2, 2023

/cc @alvaroaleman

alvaroaleman
alvaroaleman approved these changes Jun 11, 2023
View reviewed changes
Copy link
Member

@alvaroaleman alvaroaleman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks!

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alvaroaleman, iiiceoo

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 11, 2023
@alvaroaleman
Copy link
Member

/cherrypick release-0.15

@k8s-infra-cherrypick-robot
Copy link

@alvaroaleman: once the present PR merges, I will cherry-pick it on top of release-0.15 in a new PR and assign it to you.

In response to this:

/cherrypick release-0.15

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 merged commit 7edfc04 into kubernetes-sigs:main Jun 11, 2023
8 of 9 checks passed
@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Jun 11, 2023
Merged
@k8s-infra-cherrypick-robot
Copy link

@alvaroaleman: new pull request created: #2372

In response to this:

/cherrypick release-0.15

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.

@sbueringer sbueringer mentioned this pull request Jul 1, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alvaroaleman alvaroaleman alvaroaleman approved these changes

@FillZpp FillZpp Awaiting requested review from FillZpp

@joelanford joelanford Awaiting requested review from joelanford

Assignees

@alvaroaleman alvaroaleman

@FillZpp FillZpp

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@iiiceoo @k8s-ci-robot @FillZpp @alvaroaleman @k8s-infra-cherrypick-robot