Don't return lease not found errors on platform mismatch #46293
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
rumpl
added
status/2-code-review
process/cherry-pick
area/images
kind/bugfix
vvoland
reviewed
Aug 22, 2023
rumpl
force-pushed
the
fix-platform-check
branch
from
55a24a0
to
e229807
Compare
rumpl
changed the title
vvoland
reviewed
Aug 22, 2023
If the image for the wanted platform doesn't exist then the lease doesn't exist either. Returning this error hides the real error, so let's not return it. Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
rumpl
force-pushed
the
fix-platform-check
branch
from
e229807
to
b8ff8ea
Compare
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.
- What I did
#43939 changed the signature of
manifestMatchesPlatformand started returning the lease error, the issue is that, if the image for the wanted platform doesn't exist, then the lease doesn't exist either. We shouldn't return an error if the lease is not found- How I did it
By checking the error returned when we list lease resources.
- How to verify it
With this compose file
And this Dockerfile:
FROM alpineRun the compose project once:
$ docker compose upThen run it but with a preferred platform specified:
Before:
After:
This was reported in multiple places:
- Description for the changelog
Fixed the reported error when the local image's platform mismatches the wanted one
- A picture of a cute animal (not mandatory but encouraged)