Fix: issue cri-dockerd runtime not being found #1899
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
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #1899 +/- ##
==========================================
+ Coverage 47.91% 50.97% +3.05%
==========================================
Files 162 192 +30
Lines 23491 24961 +1470
==========================================
+ Hits 11256 12724 +1468
+ Misses 11014 10934 -80
- Partials 1221 1303 +82
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
furykerry
reviewed
Jan 29, 2025
| @@ -208,6 +208,12 @@ func detectRuntime(varRunPath string) (cfgs []runtimeConfig) { | |||
| runtimeRemoteURI: fmt.Sprintf("unix://%s/cri-dockerd.sock", varRunPath), | |||
| }) | |||
| } | |||
| if _, err = os.Stat(fmt.Sprintf("%s/cri-dockerd/cri-dockerd.sock", varRunPath)); err == nil { | |||
There was a problem hiding this comment.
can you leave comment above the code about the k3s runtime folder setup ?
There was a problem hiding this comment.
Commit was signed, comment added.
FlikweertvisionVadym
force-pushed
the
patch-1
branch
from
713467f to
d4313f1
Compare
Signed-off-by: Vadym Tartakovskyi <[email protected]> Signed-off-by: Vadym Tartakovskyi <[email protected]>
Signed-off-by: Vadym Tartakovskyi <[email protected]> Signed-off-by: Vadym Tartakovskyi <[email protected]>
FlikweertvisionVadym
force-pushed
the
patch-1
branch
from
d4313f1 to
739d50b
Compare
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.
Ⅰ. Describe what this PR does
Within this pull request, support for extra case of cri-dockerd.sock location was proposed to add.
This change absolutely follows the format how it was done for other runtimes.
Ⅱ. Does this pull request fix one issue?
NONE
Ⅲ. Describe how to verify it
Using k3s with different runtimes at different nodes the issue was that for each runtime a folder made.
Runtimes location is: /var/run/k3s. Was not able to use cri-dockerd/cri-dockerd.sock before this change.
Ⅳ. Special notes for reviews
This change absolutely follows the format how it was done for other runtimes.