Skip to content

remove mirrors from default; document the deprecation of registry.configs and registry.mirrors#5304

Merged
mikebrow merged 2 commits intocontainerd:masterfrom
mikebrow:cri-registry-doc-updates
Apr 7, 2021
Merged

remove mirrors from default; document the deprecation of registry.configs and registry.mirrors#5304
mikebrow merged 2 commits intocontainerd:masterfrom
mikebrow:cri-registry-doc-updates

Conversation

@mikebrow
Copy link
Copy Markdown
Member

@mikebrow mikebrow commented Apr 2, 2021 •
edited
Loading

Some clean up of the docs around registry config.

A fix to remove old style mirrors config from the default config. Without the fix init will report
WARN[2021-04-07T09:21:29.773381274-05:00] failed to load plugin io.containerd.grpc.v1.cri error="invalid plugin config: mirrorscannot be set whenconfig_path is provided"

Signed-off-by: Mike Brown [email protected]

@mikebrow mikebrow force-pushed the cri-registry-doc-updates branch from 88d8240 to 645b251 Compare April 2, 2021 22:36
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Apr 2, 2021

Build succeeded.

@mikebrow mikebrow added area/cri Container Runtime Interface (CRI) kind/docs priority/P1 labels Apr 2, 2021
@mikebrow mikebrow added this to the 1.5 milestone Apr 2, 2021
Zyqsempai
Zyqsempai approved these changes Apr 3, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@Zyqsempai Zyqsempai left a comment

Choose a reason for hiding this comment

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

LGTM

@zhsj
Copy link
Copy Markdown
Contributor

zhsj commented Apr 5, 2021

Not sure a question here is appropriate, is there alternative in hosts.toml for registry.mirrors.endpoint?

@mikebrow
Copy link
Copy Markdown
Member Author

mikebrow commented Apr 5, 2021 •
edited
Loading

Not sure a question here is appropriate, is there alternative in hosts.toml for registry.mirrors.endpoint?

see example here showing a set of hosts for a given default namespace..
https://github.com/containerd/containerd/blob/master/remotes/docker/config/hosts_test.go#L77-L107

chatting it up with derek the idea is config_path/host_namespace/hosts.toml

so config_path/gcr.io/hosts.toml and config_path/docker.io/hosts.toml

@mikebrow mikebrow force-pushed the cri-registry-doc-updates branch from 645b251 to 106a3df Compare April 5, 2021 17:44
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Apr 5, 2021

Build succeeded.

@mikebrow mikebrow force-pushed the cri-registry-doc-updates branch from 106a3df to 0158932 Compare April 5, 2021 20:25
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Apr 5, 2021

Build succeeded.

@mikebrow mikebrow mentioned this pull request Apr 5, 2021
Closed
@mikebrow mikebrow changed the title document the deprecation of registry.configs and registry.mirrors remove mirrors from default; document the deprecation of registry.configs and registry.mirrors Apr 5, 2021
@mikebrow mikebrow force-pushed the cri-registry-doc-updates branch from a37825f to 5238a0a Compare April 5, 2021 20:58
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Apr 5, 2021

Build succeeded.

cpuguy83
cpuguy83 reviewed Apr 5, 2021
View reviewed changes
Comment thread docs/cri/registry.md Outdated
cpuguy83
cpuguy83 approved these changes Apr 5, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

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

LGTM

@mikebrow mikebrow force-pushed the cri-registry-doc-updates branch from 5238a0a to 25d03f6 Compare April 5, 2021 23:56
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Apr 6, 2021

Build succeeded.

@mikebrow mikebrow force-pushed the cri-registry-doc-updates branch from 25d03f6 to ed5948f Compare April 7, 2021 01:40
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Apr 7, 2021

Build succeeded.

@mikebrow
Copy link
Copy Markdown
Member Author

mikebrow commented Apr 7, 2021

/test pull-containerd-node-e2e

@mikebrow mikebrow force-pushed the cri-registry-doc-updates branch from ed5948f to f9bcf4a Compare April 7, 2021 17:30
@mikebrow
Copy link
Copy Markdown
Member Author

mikebrow commented Apr 7, 2021

rebased to pick up the re-enabled cri tests

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Apr 7, 2021

Build succeeded.

dims
dims approved these changes Apr 7, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@dims dims left a comment

Choose a reason for hiding this comment

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

LGTM

we'll probably need to highlight this in release notes or something

@mikebrow mikebrow merged commit 88880f0 into containerd:master Apr 7, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dims dims dims approved these changes

@cpuguy83 cpuguy83 cpuguy83 approved these changes

+1 more reviewer

@Zyqsempai Zyqsempai Zyqsempai approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

area/cri Container Runtime Interface (CRI) kind/docs priority/P1

Projects

None yet

Milestone

1.5

Development

Successfully merging this pull request may close these issues.

5 participants

@mikebrow @zhsj @dims @cpuguy83 @Zyqsempai