Fix --docker with --container-runtime-endpoint #12705
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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>
Codecov Report❌ Patch coverage is
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
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
dereknola
approved these changes
Aug 1, 2025
mgfritch
approved these changes
Aug 1, 2025
vitorsavian
approved these changes
Aug 1, 2025
This was referenced Aug 6, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed Changes
Fix
--dockerwith--container-runtime-endpointThe 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
--docker) with--container-runtime-endpoint#12700User-Facing Change
Further Comments