Only container-runtime-endpoint wants RuntimeSocket path as URI #2836
Conversation
This file contains 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
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
briandowns
approved these changes
Jan 22, 2021
| if strings.HasPrefix(argsMap["container-runtime-endpoint"], unixPrefix) { | ||
| argsMap["container-runtime-endpoint"] = cfg.RuntimeSocket | ||
| } else { | ||
| argsMap["container-runtime-endpoint"] = unixPrefix + cfg.RuntimeSocket |
There was a problem hiding this comment.
shouldnt we just document that we that passing the endpoint should prefix with unix://
There was a problem hiding this comment.
no, because as noted here - only some things want it prefixed with unix://. cadvisor breaks if you prefix it, while kubelet complains if you don't.
dweomer
approved these changes
Jan 22, 2021
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
Only container-runtime-endpoint wants RuntimeSocket path as URI
The fix in 5b318d0 set it too early; this field is used by multiple flags and only one of them wants a URI.
Types of Changes
Bugfix
Verification
See steps in linked issue
Linked Issues
#2831
Further Comments