[release/1.6 backport] Export remote snapshotter label handler by thaJeztah · Pull Request #8054 · containerd/containerd

thaJeztah · 2023-02-06T12:39:05Z

backport of Export remote snapshotter label handler #8036 (cherry picked from commit dbf384a)
relates to Export remote snapshotter label handler #8036 (comment)

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)

cvmfs-snapshotter: https://github.com/cvmfs/cvmfs/blob/cvmfs-2.10.0/snapshotter/cvmfs/cvmfs.go#L16-L24
nydus-snapshotter: https://github.com/containerd/nydus-snapshotter/blob/v0.5.0/pkg/label/label.go#L10-L13
soci-snapshotter: https://github.com/awslabs/soci-snapshotter/blob/714f1a971e676fada47cb4c983b4728d06bab309/service/cri.go#L45-L55
overlaybd-snapshotter: https://github.com/containerd/accelerated-container-image/blob/0369b9a8b54d10bae575f4cafb323f28497b5330/pkg/snapshot/overlay.go#L117-L118
stargz-snapshotter: https://github.com/containerd/stargz-snapshotter/blob/v0.14.1/service/cri.go#L29-L39

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 · 2023-02-06T12:39:08Z

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 · 2023-02-06T15:58:32Z

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?

estesp · 2023-02-06T15:59:49Z

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 · 2023-02-06T16:00:15Z

@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 · 2023-02-07T00:39:31Z

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

ktock

LGTM. Thank you.

See containerd/containerd#8054 Signed-off-by: Yan Song <[email protected]>

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)

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)

Export remote snapshotter label handler

a6544ed

Signed-off-by: Kohei Tokunaga <[email protected]> (cherry picked from commit dbf384a) Signed-off-by: Sebastiaan van Stijn <[email protected]>

thaJeztah marked this pull request as ready for review February 6, 2023 15:58

ktock approved these changes Feb 7, 2023

View reviewed changes

fuweid approved these changes Feb 7, 2023

View reviewed changes

AkihiroSuda approved these changes Feb 8, 2023

View reviewed changes

AkihiroSuda merged commit 4a77dc8 into containerd:release/1.6 Feb 8, 2023

thaJeztah deleted the 1.6_backport_remotesnlabel branch February 8, 2023 09:51

dmcgowan mentioned this pull request Feb 10, 2023

[release/1.6] Prepare release notes for v1.6.17 #8080

Merged

imeoer added a commit to imeoer/nydus-snapshotter that referenced this pull request Feb 12, 2023

label: export label and handler defined in containerd

1802915

See containerd/containerd#8054 Signed-off-by: Yan Song <[email protected]>

imeoer added a commit to imeoer/nydus-snapshotter that referenced this pull request Feb 12, 2023

export label and handler defined in containerd

49babc0

See containerd/containerd#8054 Signed-off-by: Yan Song <[email protected]>

imeoer mentioned this pull request Feb 12, 2023

export label and handler defined in containerd containerd/nydus-snapshotter#351

Merged

imeoer added a commit to imeoer/nydus-snapshotter that referenced this pull request Feb 12, 2023

export label and handler defined in containerd

d959c58

See containerd/containerd#8054 Signed-off-by: Yan Song <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[release/1.6 backport] Export remote snapshotter label handler#8054

[release/1.6 backport] Export remote snapshotter label handler#8054
AkihiroSuda merged 1 commit intocontainerd:release/1.6from
thaJeztah:1.6_backport_remotesnlabel

thaJeztah commented Feb 6, 2023

Uh oh!

k8s-ci-robot commented Feb 6, 2023

Uh oh!

thaJeztah commented Feb 6, 2023

Uh oh!

estesp commented Feb 6, 2023

Uh oh!

thaJeztah commented Feb 6, 2023

Uh oh!

fuweid commented Feb 7, 2023

Uh oh!

ktock left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Conversation

thaJeztah commented Feb 6, 2023

Uh oh!

k8s-ci-robot commented Feb 6, 2023

Uh oh!

thaJeztah commented Feb 6, 2023

Uh oh!

estesp commented Feb 6, 2023

Uh oh!

thaJeztah commented Feb 6, 2023

Uh oh!

fuweid commented Feb 7, 2023

Uh oh!

ktock left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants