Update containerd to v2.1.3 #6040
Merged
Conversation
This file contains hidden or 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
Signed-off-by: Derek McGowan <[email protected]>
github-actions
bot
added
the
area/dependencies
tonistiigi
reviewed
Jun 20, 2025
| retErr = remoteerrors.NewUnexpectedStatusErr(resp) | ||
|
|
||
| // Decode registry error if provided | ||
| if rerr := retErr.(remoteerrors.ErrUnexpectedStatus); len(rerr.Body) > 0 { |
There was a problem hiding this comment.
Please check that this doesn't conflict with #5958
There was a problem hiding this comment.
I think this is still safe because errors.As traverses joined errors and will find an ErrUnexpectedStatus.
| // show the unexpected error message and the registry errors. The body | ||
| // is always excluded from the unexpected error message. This also allows | ||
| // clients to decode into either type. | ||
| retErr = errors.Join(rerr, registryErr) |
There was a problem hiding this comment.
Why is this doing errors.Join instead of just wrapping, iiuc creating error with newline although there is only one error condition really. At least from BuildKit point of view, it is messy that error messages change in a patch release.
crazy-max
approved these changes
Jun 20, 2025
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 various issues with pulling from registries
See https://github.com/containerd/containerd/releases/tag/v2.1.3
Fixes #6033
Fixes #6036