Skip to content

Conversation

@cpuguy83
Copy link
Member

@cpuguy83 cpuguy83 commented Feb 7, 2023

This backports #7607
This is a clean cherry-pick.

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]>
@dmcgowan dmcgowan merged commit 839086b into containerd:release/1.6 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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants