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.

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

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

Merged
merged 2 commits into from
Apr 7, 2021

Conversation

mikebrow
Copy link
Member

@mikebrow mikebrow commented Apr 2, 2021

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 brownwm@us.ibm.com

@theopenlab-ci
Copy link

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
Copy link
Member

@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
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
Member Author

mikebrow commented Apr 5, 2021

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

@theopenlab-ci
Copy link

theopenlab-ci bot commented Apr 5, 2021

Build succeeded.

@theopenlab-ci
Copy link

theopenlab-ci bot commented Apr 5, 2021

Build succeeded.

@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
@theopenlab-ci
Copy link

theopenlab-ci bot commented Apr 5, 2021

Build succeeded.

Copy link
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

@theopenlab-ci
Copy link

theopenlab-ci bot commented Apr 6, 2021

Build succeeded.

@theopenlab-ci
Copy link

theopenlab-ci bot commented Apr 7, 2021

Build succeeded.

@mikebrow
Copy link
Member Author

mikebrow commented Apr 7, 2021

/test pull-containerd-node-e2e

Signed-off-by: Mike Brown <brownwm@us.ibm.com>
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
@mikebrow
Copy link
Member Author

mikebrow commented Apr 7, 2021

rebased to pick up the re-enabled cri tests

@theopenlab-ci
Copy link

theopenlab-ci bot commented Apr 7, 2021

Build succeeded.

Copy link
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
Labels
area/cri Container Runtime Interface (CRI) kind/docs priority/P1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants