-
Notifications
You must be signed in to change notification settings - Fork 3.8k
[1.6] Backport default registry hosts config #8065
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
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Jess <[email protected]> (cherry picked from commit 8b1b81e) Signed-off-by: Brian Goff <[email protected]>
Add support for an optional `default` registry hosts config, should no other hosts config match. Signed-off-by: Jess <[email protected]> (cherry picked from commit f0bf9e7) Signed-off-by: Brian Goff <[email protected]>
samuelkarp
approved these changes
Feb 8, 2023
dmcgowan
approved these changes
Feb 8, 2023
Mengkzhaoyun
pushed a commit
to open-beagle/containerd
that referenced
this pull request
Feb 13, 2023
containerd 1.6.17 Welcome to the v1.6.17 release of containerd! The seventeenth patch release for containerd 1.6 includes various updates. * **Add network plugin metrics** ([#8018](containerd/containerd#8018)) * **Update mkdir permission on /etc/cni to 0755 instead of 0700** ([#8030](containerd/containerd#8030)) * **Export remote snapshotter label handler** ([#8054](containerd/containerd#8054)) * **Add support for default hosts.toml configuration** ([#8065](containerd/containerd#8065)) See the changelog for complete list of changes Please try out the release binaries and report any issues at https://github.com/containerd/containerd/issues. * Derek McGowan * Akihiro Suda * Jess * Antonio Ojea * Kohei Tokunaga * Phil Estes * Wei Fu <details><summary>11 commits</summary> <p> * [release/1.6] Prepare release notes for v1.6.17 ([#8080](containerd/containerd#8080)) * [`a1aa9b900`](containerd/containerd@a1aa9b9) Prepare release notes for v1.6.17 * [1.6] Backport default registry hosts config ([#8065](containerd/containerd#8065)) * [`1436641b8`](containerd/containerd@1436641) Support default hosts.toml configuration * [`87acecd04`](containerd/containerd@87acecd) Update hosts doc * [release/1.6 backport] Export remote snapshotter label handler ([#8054](containerd/containerd#8054)) * [`a6544ed7d`](containerd/containerd@a6544ed) Export remote snapshotter label handler * [release/1.6] cri: mkdir /etc/cni with 0755, not 0700 ([#8030](containerd/containerd#8030)) * [`ae02a24a3`](containerd/containerd@ae02a24) cri: mkdir /etc/cni with 0755, not 0700 * [release/1.6] add network plugin metrics ([#8018](containerd/containerd#8018)) * [`6c6cc5ec1`](containerd/containerd@6c6cc5e) add network plugin metrics </p> </details> This release has no dependency changes Previous release can be found at [v1.6.16](https://github.com/containerd/containerd/releases/tag/v1.6.16)
smira
added a commit
to smira/talos
that referenced
this pull request
Feb 16, 2023
Talos always supported that, but CRI config lacked support for it. Now with recent containerd the new `_default` host is used as a fallback, so this re-enables the support and updates the docs. See containerd/containerd#8065 Signed-off-by: Andrey Smirnov <[email protected]>
smira
added a commit
to smira/talos
that referenced
this pull request
Feb 16, 2023
Talos always supported that, but CRI config lacked support for it. Now with recent containerd the new `_default` host is used as a fallback, so this re-enables the support and updates the docs. See containerd/containerd#8065 Signed-off-by: Andrey Smirnov <[email protected]>
smira
added a commit
to smira/talos
that referenced
this pull request
Feb 16, 2023
Talos always supported that, but CRI config lacked support for it. Now with recent containerd the new `_default` host is used as a fallback, so this re-enables the support and updates the docs. See containerd/containerd#8065 Signed-off-by: Andrey Smirnov <[email protected]>
smira
added a commit
to smira/talos
that referenced
this pull request
Feb 16, 2023
Talos always supported that, but CRI config lacked support for it. Now with recent containerd the new `_default` host is used as a fallback, so this re-enables the support and updates the docs. See containerd/containerd#8065 Signed-off-by: Andrey Smirnov <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This backports #7607
This is a clean cherry-pick.