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

Enable containerd aufs/devmapper/zfs snapshotter plugins #7661

Merged
merged 1 commit into from
Jun 5, 2023

Conversation

brandond
Copy link
Member

@brandond brandond commented Jun 1, 2023

Proposed Changes

Enable containerd aufs/devmapper/zfs snapshotter plugins

These were unintentionally dropped when moving containerd back into the main multicall binary

Types of Changes

bugfix

Verification

  1. Start K3s
  2. grep type=io.containerd.snapshotter.v1 /var/lib/rancher/k3s/agent/containerd/containerd.log. Check for plugins:
time="2023-06-01T16:16:29.774504348Z" level=info msg="loading plugin \"io.containerd.snapshotter.v1.aufs\"..." type=io.containerd.snapshotter.v1
time="2023-06-01T16:16:29.777739321Z" level=info msg="loading plugin \"io.containerd.snapshotter.v1.btrfs\"..." type=io.containerd.snapshotter.v1
time="2023-06-01T16:16:29.777919781Z" level=info msg="loading plugin \"io.containerd.snapshotter.v1.devmapper\"..." type=io.containerd.snapshotter.v1
time="2023-06-01T16:16:29.777953832Z" level=info msg="loading plugin \"io.containerd.snapshotter.v1.native\"..." type=io.containerd.snapshotter.v1
time="2023-06-01T16:16:29.778025248Z" level=info msg="loading plugin \"io.containerd.snapshotter.v1.overlayfs\"..." type=io.containerd.snapshotter.v1
time="2023-06-01T16:16:29.778248703Z" level=info msg="loading plugin \"io.containerd.snapshotter.v1.fuse-overlayfs\"..." type=io.containerd.snapshotter.v1
time="2023-06-01T16:16:29.778323197Z" level=info msg="loading plugin \"io.containerd.snapshotter.v1.stargz\"..." type=io.containerd.snapshotter.v1
time="2023-06-01T16:16:29.782237739Z" level=info msg="loading plugin \"io.containerd.snapshotter.v1.zfs\"..." type=io.containerd.snapshotter.v1

Testing

Linked Issues

User-Facing Change

The bundled containerd's aufs/devmapper/zfs snapshotter plugins have been restored. These were unintentionally omitted when moving contaienrd back into the k3s multicall binary in the previous release.

Further Comments

These were unintentionally dropped when moving containerd back into the main multicall binary

Signed-off-by: Brad Davidson <[email protected]>
@brandond brandond requested a review from a team as a code owner June 1, 2023 16:19
@codecov
Copy link

codecov bot commented Jun 1, 2023

Codecov Report

Patch coverage has no change and project coverage change: -25.16 ⚠️

Comparison is base (b64a226) 45.00% compared to head (f03db50) 19.85%.

Additional details and impacted files
@@             Coverage Diff             @@
##           master    #7661       +/-   ##
===========================================
- Coverage   45.00%   19.85%   -25.16%     
===========================================
  Files         138       81       -57     
  Lines       14262     7640     -6622     
===========================================
- Hits         6419     1517     -4902     
+ Misses       6757     5894      -863     
+ Partials     1086      229      -857     
Flag Coverage Δ
inttests ?
unittests 19.85% <ø> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

see 124 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

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.

3 participants