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

Bump containerd to v1.7.0 and move back into multicall binary #7418

Merged
merged 1 commit into from
May 10, 2023

Conversation

brandond
Copy link
Member

@brandond brandond commented May 3, 2023

Proposed Changes

Restores containerd to the multicall binary, saving approximately 11MB off the shipping binary size.

This reverts much of #4757

Types of Changes

enhancement

Verification

Check k3s binary size:

k3s binary dist/artifacts/k3s size 68517888 is less than max acceptable size of 73400320 bytes (70 MiB) // current master
k3s binary dist/artifacts/k3s size 56868864 is less than max acceptable size of 73400320 bytes (70 MiB) // this PR

Testing

Linked Issues

User-Facing Change

The embedded containerd version has been bumped to `v1.7.0-k3s1`, and has been reintegrated into the main k3s binary for a significant savings in release artifact size.

Further Comments

Includes fix for CRI stats, pushed to upstream as containerd/containerd#8472

@brandond brandond requested a review from a team as a code owner May 3, 2023 20:34
scripts/download Outdated Show resolved Hide resolved
@codecov
Copy link

codecov bot commented May 3, 2023

Codecov Report

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

Comparison is base (239021e) 47.64% compared to head (1532da1) 19.48%.

❗ Current head 1532da1 differs from pull request most recent head 260ff9d. Consider uploading reports for the commit 260ff9d to get more accurate results

Additional details and impacted files
@@             Coverage Diff             @@
##           master    #7418       +/-   ##
===========================================
- Coverage   47.64%   19.48%   -28.16%     
===========================================
  Files         139       81       -58     
  Lines       14254     5497     -8757     
===========================================
- Hits         6791     1071     -5720     
+ Misses       6390     4204     -2186     
+ Partials     1073      222      -851     
Flag Coverage Δ
inttests ?
unittests 19.48% <ø> (-0.40%) ⬇️

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

see 139 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.

@dereknola
Copy link
Member

Waiting on changeover to k3s-io

@brandond brandond force-pushed the revert_standalone_containerd branch from 63cb817 to 5087cd2 Compare May 4, 2023 23:57
@brandond brandond requested a review from dereknola May 4, 2023 23:57
@brandond brandond force-pushed the revert_standalone_containerd branch 2 times, most recently from 817844a to 1532da1 Compare May 5, 2023 23:22
@brandond brandond force-pushed the revert_standalone_containerd branch from 1532da1 to 260ff9d Compare May 9, 2023 22:26
@brandond brandond merged commit 607cbf0 into k3s-io:master May 10, 2023
@brandond brandond deleted the revert_standalone_containerd branch June 6, 2024 21:19
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