Skip to content

Conversation

@thaJeztah
Copy link
Member

I wonder if this could make sense for a 1.6 patch release if it would help transitioning. Overall it seems fairly low risk, but it's not a "bug-fix" or "security-fix", so not sure if it would qualify (would be nice though!)


⚠️ I had conflicts in:

  • pkg/cri/server/image_pull.go
  • pkg/cri/server/image_pull_test.go

The conflicts were in adjacent line changes; I looked at the "parent" commit for #8036 (753bfd6), and the code that was moved did not change;

  • pkg/cri/server/image_pull.go (appendInfoHandlerWrapper(), getLayers() and the constants):
  • pkg/cri/server/image_pull_test.go (TestImageLayersLabel)

on main at 753bfd6

on release/1.6 at 4335c65


Now the user of remote snapshotter labels appended by CRI plugin is not only stargz-snapshotter but also several remote snapshotter implementations in the community. (There is also discussion to use them from non-snapshotter tool moby/moby#44810)

Currently, the code is defined as private variables/functions so projects outside containerd need to copy-and-paste them. These clones aren't easy to maintain because they need to be copy-and-pasted again every time changes occur on the upstream code.
This PR exports remote snapshotter's label-related logic and tries to make it easier to maintain tools around remote snapshotters.

Signed-off-by: Kohei Tokunaga <[email protected]>
(cherry picked from commit dbf384a)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@k8s-ci-robot
Copy link

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@thaJeztah
Copy link
Member Author

Failures should be unrelated;

E: Failed to fetch http://azure.archive.ubuntu.com/ubuntu/pool/main/g/gcc-defaults/g++-aarch64-linux-gnu_9.3.0-1ubuntu2_amd64.deb  Connection failed [IP: 52.154.174.208 80]
E: Failed to fetch http://azure.archive.ubuntu.com/ubuntu/pool/main/libc/libconfig-inifiles-perl/libconfig-inifiles-perl_3.000002-1_all.deb  503  Service Unavailable [IP: 52.154.174.208 80]
E: Unable to fetch some archives, maybe run apt-get update or try with --fix-missing?

@thaJeztah thaJeztah marked this pull request as ready for review February 6, 2023 15:58
@estesp
Copy link
Member

estesp commented Feb 6, 2023

Yeah, a lot of PR checks are getting stuck on Azure networking issue with the Ubuntu apt repos; may be better now but has been failing for hours

@thaJeztah
Copy link
Member Author

@ktock @estesp @fuweid ptal - let me know if you're ok with backporting this to 1.6 (also note the "conflicts" I ran into - see top description - but only adjacent lines, so should be ok®)

@fuweid
Copy link
Member

fuweid commented Feb 7, 2023

@thaJeztah The backport looks good to me. I have re-run the CI.

Copy link
Member

@ktock ktock left a comment

Choose a reason for hiding this comment

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

LGTM. Thank you.

@AkihiroSuda AkihiroSuda merged commit 4a77dc8 into containerd:release/1.6 Feb 8, 2023
@thaJeztah thaJeztah deleted the 1.6_backport_remotesnlabel branch February 8, 2023 09:51
imeoer added a commit to imeoer/nydus-snapshotter that referenced this pull request Feb 12, 2023
imeoer added a commit to imeoer/nydus-snapshotter that referenced this pull request Feb 12, 2023
imeoer added a commit to imeoer/nydus-snapshotter that referenced this pull request Feb 12, 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)
aravindhp referenced this pull request in openshift/containerd Feb 28, 2023
containerd 1.6.19

Welcome to the v1.6.19 release of containerd!

The nineteenth patch release for containerd 1.6 contains runtime fixes and additions for Windows platforms

* **Update hcsshim to v0.9.7 to include fix for graceful termination and pause containers ([containerd#8153](containerd#8153))

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.

* Kirtana Ashok
* Derek McGowan
* Wei Fu

<details><summary>4 commits</summary>
<p>

* [release/1.6] Prepare release notes for v1.6.19 ([containerd#8157](containerd#8157))
  * [`23e94075a`](containerd@23e9407) Add release notes for v1.6.19
* [release/1.6] go.mod: Bump hcsshim to v0.9.7 ([containerd#8153](containerd#8153))
  * [`f488a6241`](containerd@f488a62) Update hcsshim tag to v0.9.7
</p>
</details>

* **github.com/Microsoft/hcsshim**  v0.9.6 -> v0.9.7

Previous release can be found at [v1.6.18](https://github.com/containerd/containerd/releases/tag/v1.6.18)
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.

6 participants