-
Notifications
You must be signed in to change notification settings - Fork 19
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
feat: search PATH for CNI plugins and required binaries #107
Conversation
Only until synadia-io/nex#107 is merged.
Thanks @brianmcgee! When #104 lands later today, this PR will likely need to be edited as a lot of the internals are changing. @kthomas and I have spoken about it, and we are happy to help port this once the pending changes land |
Seems I have great timing 😉 |
24f37ac
to
941c19f
Compare
@jordan-rash rebased on #104 |
Other then the small nit, this LGTM. Could you do one more rebase (to fix the hanging tests) and we will get it merged |
I'll have a look later this evening, having some trouble running the test suite on NixOS which I need to work through. |
e6892a2
to
70936ee
Compare
- adds `BinPath` to CNI node config and passes this through to CNI. - defaults CNI bin path to match the process `PATH`, pre-pending `/opt/cni/bin` first. - adds support to preflight to check multiple directories instead of just one. - defaults the user binaries directory list to match the process `PATH`, pre-pending `/usr/local/bin` first. - if installation of missing dependencies is desired, they are installed in the first entry in the directory lists e.g. `/opt/cni/bin`, `/usr/local/bin` which preserves the current behaviour. This change is designed to make it easier to integrate with Nix, where binaries are not installed in the usual places. More generally I think it provides better ergonomics to check in the `PATH`.
I didn't have docker installed, but it took a while to figure out the issue as the fc-image build was not checking for errors.
This is to allow the tests to run on NixOS.
70936ee
to
a88b370
Compare
Awesome. I'll do a quick review and get it merged |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
BinPath
to CNI node config and passes this through to CNI.PATH
, pre-pending/opt/cni/bin
first.PATH
, pre-pending/usr/local/bin
first./opt/cni/bin
,/usr/local/bin
which preserves the current behaviour.This change is designed to make it easier to integrate with Nix, where binaries are not installed in the usual places. More generally I think it provides better ergonomics to check in the
PATH
.