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

[release/1.5] cherry-pick: Fix order of operations when setting lease labels #7746

Conversation

austinvazquez
Copy link
Contributor

Fixes an edge case where WithLabels would overwrite WithExpiration on a lease when using client options.

(cherry picked from commit c4dee23)
Signed-off-by: Austin Vazquez macedonv@amazon.com

Fixes an edge case where `WithLabels` would overwrite `WithExpiration`
on a lease when using client options.

(cherry picked from commit c4dee23)
Signed-off-by: Austin Vazquez <macedonv@amazon.com>
@k8s-ci-robot
Copy link

Hi @austinvazquez. Thanks for your PR.

I'm waiting for a containerd 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.

@estesp estesp changed the title [release/1.5] Fix order of operations when setting lease labels [release/1.5] cherry-pick: Fix order of operations when setting lease labels Dec 1, 2022
Copy link
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

@austinvazquez austinvazquez marked this pull request as ready for review December 1, 2022 22:34
@fuweid fuweid merged commit a0a9a0e into containerd:release/1.5 Dec 1, 2022
@austinvazquez austinvazquez deleted the cherry-pick-c4dee237f57a7f7895aaaf32cae6ab312019014a-to-release-1.5 branch December 1, 2022 23:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Development

Successfully merging this pull request may close these issues.

None yet

4 participants