Skip to content

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

Merged
fuweid merged 1 commit intocontainerd:release/1.6from
austinvazquez:cherry-pick-c4dee237f57a7f7895aaaf32cae6ab312019014a-to-release-1.6
Dec 1, 2022
Merged

[release/1.6] cherry-pick: Fix order of operations when setting lease labels#7745
fuweid merged 1 commit intocontainerd:release/1.6from
austinvazquez:cherry-pick-c4dee237f57a7f7895aaaf32cae6ab312019014a-to-release-1.6

Conversation

@austinvazquez
Copy link
Copy Markdown
Member

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 [email protected]

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 <[email protected]>
@k8s-ci-robot
Copy link
Copy Markdown

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.

Details

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.6] Fix order of operations when setting lease labels [release/1.6] cherry-pick: Fix order of operations when setting lease labels Dec 1, 2022
Copy link
Copy Markdown
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:52
@fuweid fuweid merged commit 92ee926 into containerd:release/1.6 Dec 1, 2022
@austinvazquez austinvazquez deleted the cherry-pick-c4dee237f57a7f7895aaaf32cae6ab312019014a-to-release-1.6 branch December 1, 2022 23:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

4 participants