Skip to content

Support default hosts.toml configuration #7607

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
Merged
kzys merged 2 commits into from
Nov 4, 2022
Merged

Support default hosts.toml configuration #7607

kzys merged 2 commits into from
Nov 4, 2022

Conversation

@jess-sol
Copy link
Contributor

@jess-sol jess-sol commented Oct 31, 2022

Add support for an optional default registry hosts config, should no other hosts config match. Discussed in #7597

@k8s-ci-robot
Copy link

k8s-ci-robot commented Oct 31, 2022

Hi @jess-sol. 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.

Details

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.

kzys
kzys reviewed Nov 3, 2022
View reviewed changes
Copy link
Member

@kzys kzys left a comment

Choose a reason for hiding this comment

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

Please update https://github.com/containerd/containerd/blob/main/docs/hosts.md as well.

@kzys kzys requested a review from dmcgowan November 3, 2022 20:59
@dmcgowan
Copy link
Member

dmcgowan commented Nov 3, 2022

The change looks good. If we are going to build it into the default directory path logic then it could be ideal to choose a default directory which isn't also a valid domain name, such as _default. We try to avoid any possibility of ambiguity with edge cases when possible.

@jess-sol
Support default hosts.toml configuration
f0bf9e7 
Add support for an optional `default` registry hosts config, should no
other hosts config match.

Signed-off-by: Jess <[email protected]>
@jess-sol
Update hosts doc
8b1b81e 
Signed-off-by: Jess <[email protected]>
@jess-sol
Copy link
Contributor Author

jess-sol commented Nov 3, 2022

Yeah that's a good point, I hadn't really considered bare hostnames when I named it; updated!

@kzys kzys merged commit e306680 into containerd:main Nov 4, 2022
@dmcgowan dmcgowan added this to the 1.7 milestone Nov 4, 2022
@dmcgowan dmcgowan mentioned this pull request Dec 10, 2022
Merged
@dmcgowan dmcgowan mentioned this pull request Jan 3, 2023
Merged
@dmcgowan dmcgowan mentioned this pull request Jan 28, 2023
Merged
@cpuguy83 cpuguy83 mentioned this pull request Feb 7, 2023
Merged
@dmcgowan dmcgowan mentioned this pull request Feb 15, 2023
Merged
This was referenced Feb 25, 2023
Merged
Merged
This was referenced Mar 7, 2023
Merged
Merged
Merged
@thaJeztah thaJeztah added cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch and removed cherry-pick/1.6.x labels Jul 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kzys kzys kzys approved these changes

@dmcgowan dmcgowan dmcgowan approved these changes

Assignees

No one assigned

Labels

cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch impact/changelog ok-to-test

Projects

None yet

Milestone

1.7

Development

Successfully merging this pull request may close these issues.

5 participants

@jess-sol @k8s-ci-robot @dmcgowan @kzys @thaJeztah