Skip to content

Fix --docker with --container-runtime-endpoint#12705

Merged
brandond merged 1 commit into
k3s-io:masterfrom
brandond:fix-cri-dockerd-endpoint
Aug 1, 2025
Merged

Fix --docker with --container-runtime-endpoint#12705
brandond merged 1 commit into
k3s-io:masterfrom
brandond:fix-cri-dockerd-endpoint

Conversation

@brandond

@brandond brandond commented Aug 1, 2025

Copy link
Copy Markdown
Member

Proposed Changes

Fix --docker with --container-runtime-endpoint

The container runtime endpoint value is passed into cri-dockerd as the docker socket address, so we need to check for --docker BEFORE checking for non-nil --container-runtime-endpoint.

Types of Changes

bugfix

Verification

See linked issue

Testing

No.

pkg/agent/config/get() is an unholy 400 line behemoth that handles both retrieving config from the server, and merging it with cli flags. We should break it out into separate functions that can be tested.

Linked Issues

User-Facing Change

Further Comments

The container runtime endpoint value is passed into cri-dockerd as the docker socket address, so we need to check for --docker BEFORE checking for non-nil --container-runtime-endpoint.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@brandond
brandond requested a review from a team as a code owner August 1, 2025 18:44
@codecov

codecov Bot commented Aug 1, 2025

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 0% with 3 lines in your changes missing coverage. Please review.
✅ Project coverage is 20.49%. Comparing base (fb222e9) to head (b53a425).
⚠️ Report is 1 commits behind head on master.

Files with missing lines Patch % Lines
pkg/agent/config/config.go 0.00% 3 Missing ⚠️

❗ There is a different number of reports uploaded between BASE (fb222e9) and HEAD (b53a425). Click for more details.

HEAD has 1 upload less than BASE
Flag BASE (fb222e9) HEAD (b53a425)
e2etests 1 0
Additional details and impacted files
@@             Coverage Diff             @@
##           master   #12705       +/-   ##
===========================================
- Coverage   40.73%   20.49%   -20.24%     
===========================================
  Files         184      181        -3     
  Lines       18869    18801       -68     
===========================================
- Hits         7686     3853     -3833     
- Misses      10008    14512     +4504     
+ Partials     1175      436      -739     
Flag Coverage Δ
e2etests ?
unittests 20.49% <0.00%> (-0.01%) ⬇️

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.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@brandond
brandond merged commit 3bae735 into k3s-io:master Aug 1, 2025
67 of 68 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.

4 participants