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

[release-1.26] Bump cri-dockerd to fix compat with Docker Engine 25 #9292

Merged

Conversation

brandond
Copy link
Contributor

@brandond brandond commented Jan 25, 2024

Proposed Changes

  • Bump cri-dockerd to fix compat with Docker Engine 25
  • Handle component exits more consistently

Types of Changes

version bump

Verification

check cri-dockerd version in logs

Testing

Linked Issues

User-Facing Change

Further Comments

@brandond brandond requested a review from a team as a code owner January 25, 2024 01:41
Copy link

codecov bot commented Jan 25, 2024

Codecov Report

Attention: 42 lines in your changes are missing coverage. Please review.

Comparison is base (489d9b3) 14.98% compared to head (245d8bd) 14.92%.

Files Patch % Lines
pkg/daemons/executor/embed.go 0.00% 30 Missing ⚠️
pkg/agent/cridockerd/cridockerd.go 0.00% 5 Missing ⚠️
pkg/agent/containerd/containerd.go 0.00% 4 Missing ⚠️
pkg/agent/flannel/setup.go 0.00% 3 Missing ⚠️
Additional details and impacted files
@@               Coverage Diff                @@
##           release-1.26    #9292      +/-   ##
================================================
- Coverage         14.98%   14.92%   -0.06%     
================================================
  Files               115      115              
  Lines              8430     8462      +32     
================================================
  Hits               1263     1263              
- Misses             6918     6950      +32     
  Partials            249      249              
Flag Coverage Δ
unittests 14.92% <0.00%> (-0.06%) ⬇️

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

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@brandond brandond force-pushed the bump-cri-dockerd_release-1.26 branch from 49cb396 to 245d8bd Compare February 7, 2024 18:43
@brandond brandond merged commit c190124 into k3s-io:release-1.26 Feb 8, 2024
15 checks passed
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.

None yet

2 participants