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

Support default hosts.toml configuration #7607

Merged
merged 2 commits into from
Nov 4, 2022
Merged

Conversation

jess-sol
Copy link
Contributor

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

@k8s-ci-robot
Copy link

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.

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.

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.

@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.

Add support for an optional `default` registry hosts config, should no
other hosts config match.

Signed-off-by: Jess <jess@ros.io>
Signed-off-by: Jess <jess@ros.io>
@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!

@dmcgowan dmcgowan added this to New in Code Review via automation Nov 4, 2022
@dmcgowan dmcgowan moved this from New to Ready For Review in Code Review Nov 4, 2022
@dmcgowan dmcgowan added the cherry-pick/1.6.x Change to be cherry picked to release/1.6 branch label Nov 4, 2022
@kzys kzys moved this from Ready For Review to Merge on Green in Code Review Nov 4, 2022
@kzys kzys merged commit e306680 into containerd:main Nov 4, 2022
Code Review automation moved this from Merge on Green to Done Nov 4, 2022
@dmcgowan dmcgowan added this to the 1.7 milestone Nov 4, 2022
@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 Change to be cherry picked to release/1.6 branch labels Jul 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch impact/changelog ok-to-test
Projects
Development

Successfully merging this pull request may close these issues.

None yet

5 participants