Fix deprecated registry auth conversion.#4987
Merged
estesp merged 1 commit intocontainerd:masterfrom Feb 4, 2021
Merged
Conversation
|
Build succeeded.
|
Random-Liu
force-pushed
the
fix-auth-config-conversion
branch
from
a11cbb2 to
19d3f11
Compare
|
Build succeeded.
|
AkihiroSuda
approved these changes
Feb 2, 2021
AkihiroSuda
reviewed
Feb 2, 2021
Member
There was a problem hiding this comment.
nit: errors.Wrapf could be used here
Member
Author
There was a problem hiding this comment.
Done. Forgot about this. :P
Zyqsempai
approved these changes
Feb 2, 2021
Signed-off-by: Lantao Liu <[email protected]>
Random-Liu
force-pushed
the
fix-auth-config-conversion
branch
from
19d3f11 to
b5bf1fd
Compare
|
Build succeeded.
|
AkihiroSuda
approved these changes
Feb 4, 2021
Member
|
Looks like these have to be cherry-picked in the https://github.com/containerd/cri repository, and then vendored in |
AkihiroSuda
added
cherry-picked/1.4.x
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
In the old field
registry.authsin containerd 1.2, the field has the scheme. https://github.com/containerd/cri/blob/release/1.4/docs/registry.md#configure-registry-credentialsHowever, in the new field
registry.configsintroduced in containerd 1.3 and above, the field doesn't need the scheme any more. https://github.com/containerd/cri/blob/master/docs/registry.md#configure-registry-credentialsAlthough containerd 1.2 is End-Of-Life, the config option field is not removed yet, so we should do the conversion correctly.
This should probably be cherrypicked into 1.3 and 1.4.