Fix order of operations when setting lease labels #7702
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
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 Once the patch is verified, the new status will be reflected by the 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. |
fuweid
reviewed
Nov 20, 2022
fuweid
reviewed
Nov 20, 2022
austinvazquez
force-pushed
the
resolve-order-of-operations-in-leases
branch
2 times, most recently
from
b0a1057
to
b32a4db
Compare
Fixes an edge case where `WithLabels` would overwrite `WithExpiration` on a lease when using client options. Signed-off-by: Austin Vazquez <macedonv@amazon.com>
austinvazquez
force-pushed
the
resolve-order-of-operations-in-leases
branch
from
b32a4db
to
c4dee23
Compare
fuweid
approved these changes
Nov 23, 2022
dcantah
approved these changes
Nov 30, 2022
dmcgowan
approved these changes
Nov 30, 2022
estesp
added
cherry-picked/1.5.x
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes an edge case where
WithLabelswould overwriteWithExpirationon a lease when using both client options and a expire value is not provided via labels. A user may expect the maps to be merged.For example, see https://github.com/containerd/containerd/blob/main/cmd/ctr/commands/images/mount.go#L75-L81
Signed-off-by: Austin Vazquez macedonv@amazon.com