This repository was archived by the owner on Mar 9, 2022. It is now read-only.
Merged
Conversation
Random-Liu
force-pushed
the
add-auth-config
branch
from
2c67221 to
9dfae13
Compare
mikebrow
reviewed
Jul 9, 2018
Member
mikebrow
left a comment
mikebrow
left a comment
There was a problem hiding this comment.
See comments to docs code looks good!
docs/registry.md
Outdated
| The meaning of each field is the same with the corresponding field in `.docker/config.json`. | ||
|
|
||
| Please note that auth config passed by CRI takes precedence. The registry | ||
| credential in the config file will only be used when auth config is not specified |
Member
There was a problem hiding this comment.
/s/the config file/this config/
docs/registry.md
Outdated
| ``` | ||
| The meaning of each field is the same with the corresponding field in `.docker/config.json`. | ||
|
|
||
| Please note that auth config passed by CRI takes precedence. The registry |
Member
There was a problem hiding this comment.
takes precedence over this config.
docs/registry.md
Outdated
|
|
||
| Please note that auth config passed by CRI takes precedence. The registry | ||
| credential in the config file will only be used when auth config is not specified | ||
| by CRI. |
Member
There was a problem hiding this comment.
/s/by CRI/by kubernetes via CRI/
Follow this link to read about configuring kubernetes pod to use images from private registries.
Random-Liu
force-pushed
the
add-auth-config
branch
from
9dfae13 to
d2eba28
Compare
Random-Liu
force-pushed
the
add-auth-config
branch
from
d2eba28 to
f1f6050
Compare
Signed-off-by: Lantao Liu <lantaol@google.com>
Signed-off-by: Lantao Liu <lantaol@google.com>
Random-Liu
force-pushed
the
add-auth-config
branch
from
f1f6050 to
e4ad680
Compare
abhi
approved these changes
Jul 10, 2018
Signed-off-by: Lantao Liu <lantaol@google.com>
|
New changes are detected. LGTM label has been removed. |
Member
Author
|
Just updated containerd version to use #835. Re-apply LGTM. |
Random-Liu
added a commit
that referenced
this pull request
Jul 11, 2018
Random-Liu
added a commit
that referenced
this pull request
Jul 11, 2018
Random-Liu
added a commit
that referenced
this pull request
Jul 11, 2018
Random-Liu
added a commit
that referenced
this pull request
Jul 11, 2018
Cherrypick #838 to release/1.11
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 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.
Fixes #723.
Fixes #835.
/cc @dmcgowan for the resolver change.
This PR:
criplugin to use containerd docker resolver instead of our own fork. This gets rid of a lot of code duplication and maintenance overhead.I'll mark this 1.11 and cherrypick into 1.11. Containerd 1.2 is our real release, I think it is fine to add new features before that.