Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

docs: update registry config guide #10075

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

docs: update registry config guide #10075

wants to merge 1 commit into from
+44 −1

Conversation

ZhangShuaiyi
Copy link
Contributor

@ZhangShuaiyi ZhangShuaiyi commented Apr 15, 2024 •
edited

Update registry config guide to use CRI service plugin type added in #9681

-       // CRIImagePlugin implements a cri image service
-       CRIImagePlugin plugin.Type = "io.containerd.cri.image.v1"
+       // CRIServicePlugin implements a cri service
+       CRIServicePlugin plugin.Type = "io.containerd.cri.v1"

Fix: #10074

@k8s-ci-robot
Copy link

Hi @ZhangShuaiyi. 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 /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

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
fuweid approved these changes Apr 19, 2024
View reviewed changes
Copy link
Member

@fuweid fuweid left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@fuweid fuweid added the easy-to-review Easy to review label Apr 19, 2024
ruiwen-zhao
ruiwen-zhao reviewed Apr 19, 2024
View reviewed changes
docs/cri/registry.md Outdated
@@ -26,7 +26,7 @@ version = 2

# The registry host has to be a domain name or IP. Port number is also
# needed if the default HTTPS or HTTP port is not used.
[plugins."io.containerd.grpc.v1.cri".registry.configs."gcr.io".auth]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think you need to change this in this file, because plugins."io.containerd.grpc.v1.cri".registry.configs is removed in containerd 2.0 anyway. (and plugins."io.containerd.cri.v1.images" is only introduced in containerd 2.0)

In this file (registry.md), I think you only need to update line 9, which you already did.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about to add registry config guide for version 3?

@ZhangShuaiyi
docs: update registry config guide
c514630 
Signed-off-by: Shuaiyi Zhang <zhang_syi@qq.com>
@ZhangShuaiyi
Copy link
Contributor Author

cc @dmcgowan

fuweid
fuweid approved these changes May 5, 2024
View reviewed changes
Copy link
Member

@fuweid fuweid left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@fuweid fuweid added this pull request to the merge queue May 5, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks May 5, 2024
@fuweid fuweid added this pull request to the merge queue May 6, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks May 6, 2024
@fuweid fuweid added this pull request to the merge queue May 6, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks May 6, 2024
@dmcgowan dmcgowan added this pull request to the merge queue May 6, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks May 6, 2024
@mxpv mxpv added this pull request to the merge queue May 8, 2024
@mxpv mxpv mentioned this pull request May 8, 2024
Merged
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks May 8, 2024
@mxpv mxpv added this pull request to the merge queue May 8, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks May 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ruiwen-zhao ruiwen-zhao ruiwen-zhao left review comments

@mxpv mxpv mxpv approved these changes

@henry118 henry118 henry118 approved these changes

@fuweid fuweid fuweid approved these changes

Assignees
No one assigned
Labels
easy-to-review Easy to review needs-ok-to-test size/M
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

docs: image and registry config guide need to be updated
6 participants
@ZhangShuaiyi @k8s-ci-robot @mxpv @henry118 @ruiwen-zhao @fuweid