Make kargs.sh work with systemd service and for Ubuntu #53
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
|
Thanks for your PR,
To skip the vendors CIs, Maintainers can use one of:
|
e0ne
force-pushed
the
ubuntu-kargs
branch
2 times, most recently
from
596b809 to
dfb9915
Compare
Pull Request Test Coverage Report for Build 13436956034Details
💛 - Coveralls |
e0ne
force-pushed
the
ubuntu-kargs
branch
5 times, most recently
from
508a194 to
265f915
Compare
rollandf
approved these changes
Feb 20, 2025
|
Missing Signed-off? |
rollandf
approved these changes
Feb 20, 2025
heyvister1
reviewed
Feb 20, 2025
| @@ -81,7 +81,8 @@ type genericPluginOptions struct { | |||
| skipBridgeConfiguration bool | |||
| } | |||
|
|
|||
| const scriptsPath = "bindata/scripts/kargs.sh" | |||
| const daemonScriptsPath = "bindata/scripts/kargs.sh" | |||
There was a problem hiding this comment.
nit. try to refrain of relative path
Suggested change
| const daemonScriptsPath = "bindata/scripts/kargs.sh" | |
| const daemonScriptsPath = "/bindata/scripts/kargs.sh" |
heyvister1
reviewed
Feb 20, 2025
| @@ -81,7 +81,8 @@ type genericPluginOptions struct { | |||
| skipBridgeConfiguration bool | |||
| } | |||
|
|
|||
| const scriptsPath = "bindata/scripts/kargs.sh" | |||
| const daemonScriptsPath = "bindata/scripts/kargs.sh" | |||
| const systemdScriptsPath = "//var/lib/sriov/kargs.sh" | |||
There was a problem hiding this comment.
nit. remove double '/'
Suggested change
| const systemdScriptsPath = "//var/lib/sriov/kargs.sh" | |
| const systemdScriptsPath = "/var/lib/sriov/kargs.sh" |
heyvister1
reviewed
Feb 20, 2025
| @@ -116,7 +116,7 @@ spec: | |||
| command: | |||
| - /bin/bash | |||
| - -c | |||
| - mkdir -p /host/var/lib/sriov/ && cp /usr/bin/sriov-network-config-daemon /host/var/lib/sriov/sriov-network-config-daemon && chcon -t bin_t /host/var/lib/sriov/sriov-network-config-daemon | true # Allow systemd to run the file, use pipe true to not failed if the system doesn't have selinux or apparmor enabled | |||
| - mkdir -p /host/var/lib/sriov/ && cp /usr/bin/sriov-network-config-daemon /host/var/lib/sriov/sriov-network-config-daemon && chcon -t bin_t /host/var/lib/sriov/sriov-network-config-daemon | true && cp /bindata/scripts/kargs.sh /host/var/lib/sriov/kargs.sh && chcon -t bin_t /host/var/lib/sriov/kargs.sh | true # Allow systemd to run the file, use pipe true to not failed if the system doesn't have selinux or apparmor enabled | |||
There was a problem hiding this comment.
nit. This is a very long command, and can tend to be error prune. You should consider using another script (e.g. init-systemd.sh) and break this command to several lines in script
There was a problem hiding this comment.
good catch is it ok to do it in a follow up PR?
Signed-off-by: Ivan Kolodiazhnyi <[email protected]>
heyvister1
approved these changes
Feb 20, 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.
No description provided.