-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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
Add more paths to crun runtime detection #9086
Conversation
Signed-off-by: Lex Rivera <[email protected]>
Signed-off-by: Lex Rivera <[email protected]>
bc330c3
to
0ccabab
Compare
We're picking up a lot of different hardcoded paths here, I'm kinda starting to feel like we should just search $PATH for the bins with os.LookPath and be done with it. |
I checked crun packages and it seems like it can be trimmed down to just /usr/bin and /usr/local/bin: https://rpmfind.net/linux/RPM/fedora/updates/39/aarch64/Packages/c/crun-1.12-1.fc39.aarch64.html As crun doesn't require any special permissions to just run, there is no need to put that to sbin |
This looks good for now but I think I may rework the entire runtime detection code to reduce duplication at some point. |
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #9086 +/- ##
==========================================
- Coverage 46.35% 41.65% -4.71%
==========================================
Files 148 148
Lines 15900 15902 +2
==========================================
- Hits 7371 6624 -747
- Misses 7354 8149 +795
+ Partials 1175 1129 -46
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
* add usr/local paths for crun detection Signed-off-by: Lex Rivera <[email protected]> (cherry picked from commit 5fe074b) Signed-off-by: Brad Davidson <[email protected]>
* add usr/local paths for crun detection Signed-off-by: Lex Rivera <[email protected]> (cherry picked from commit 5fe074b) Signed-off-by: Brad Davidson <[email protected]>
* add usr/local paths for crun detection Signed-off-by: Lex Rivera <[email protected]> (cherry picked from commit 5fe074b) Signed-off-by: Brad Davidson <[email protected]>
* add usr/local paths for crun detection Signed-off-by: Lex Rivera <[email protected]> (cherry picked from commit 5fe074b) Signed-off-by: Brad Davidson <[email protected]>
* add usr/local paths for crun detection Signed-off-by: Lex Rivera <[email protected]> (cherry picked from commit 5fe074b) Signed-off-by: Brad Davidson <[email protected]>
* add usr/local paths for crun detection Signed-off-by: Lex Rivera <[email protected]> (cherry picked from commit 5fe074b) Signed-off-by: Brad Davidson <[email protected]>
* add usr/local paths for crun detection Signed-off-by: Lex Rivera <[email protected]> (cherry picked from commit 5fe074b) Signed-off-by: Brad Davidson <[email protected]>
* add usr/local paths for crun detection Signed-off-by: Lex Rivera <[email protected]> (cherry picked from commit 5fe074b) Signed-off-by: Brad Davidson <[email protected]>
* add usr/local paths for crun detection Signed-off-by: Lex Rivera <[email protected]> (cherry picked from commit 5fe074b) Signed-off-by: Brad Davidson <[email protected]>
Proposed Changes
Add /usr/local/bin and /usr/local/sbin to crun detection. Crun can also be installed manually, without packages, and /usr/local is preferred path when dealing with non-packaged software.
Types of Changes
New feature
Verification
Drop crun binary to /usr/local/bin or /usr/local/sbin, k3s should detect it and add to containerd config
Testing
This is just new path to detection, so i hasn't touched tests
Linked Issues
#9112
User-Facing Change
Further Comments