Make kargs.sh work with systemd service and for Ubuntu

Signed-off-by: Ivan Kolodiazhnyi <[email protected]>

Author: e0ne

bindata/manifests/daemon/daemonset.yaml

@@ -125,6 +125,8 @@ spec:
               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
+              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
           securityContext:
             privileged: true
           resources:

bindata/scripts/kargs.sh

@@ -60,4 +60,4 @@ else
     done
 fi
 
-echo $ret
+echo $ret

pkg/daemon/daemon_test.go

@@ -47,7 +47,7 @@ var (
 )
 
 const (
-	waitTime  = 30 * time.Minute
+	waitTime  = 2 * time.Minute
 	retryTime = 5 * time.Second
 )
 
@@ -112,6 +112,7 @@ var _ = Describe("Daemon Controller", Ordered, func() {
 		// general
 		hostHelper.EXPECT().Chroot(gomock.Any()).Return(func() error { return nil }, nil).AnyTimes()
 		hostHelper.EXPECT().RunCommand("/bin/sh", gomock.Any(), gomock.Any(), gomock.Any()).Return("", "", nil).AnyTimes()
+		hostHelper.EXPECT().RunCommand("/bin/bash", gomock.Any(), gomock.Any(), gomock.Any()).Return("", "", nil).AnyTimes()
 
 	})
 

pkg/plugins/generic/generic_plugin.go

@@ -3,6 +3,7 @@ package generic
 import (
 	"errors"
 	"fmt"
+	"os"
 	"syscall"
 
 	"sigs.k8s.io/controller-runtime/pkg/log"
@@ -80,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"
 
 // Initialize our plugin and set up initial values
 func NewGenericPlugin(helpers helper.HostHelpersInterface, options ...Option) (plugin.VendorPlugin, error) {
@@ -269,7 +271,11 @@ func needDriverCheckVdpaType(state *sriovnetworkv1.SriovNetworkNodeState, driver
 // editKernelArg Tries to add the kernel args via ostree or grubby.
 func editKernelArg(helper helper.HostHelpersInterface, mode, karg string) error {
 	log.Log.Info("generic plugin editKernelArg()", "mode", mode, "karg", karg)
-	_, _, err := helper.RunCommand("/bin/sh", scriptsPath, mode, karg)
+	script := daemonScriptsPath
+	if _, err := os.Stat(consts.Host); errors.Is(err, os.ErrNotExist) {
+		script = systemdScriptsPath
+	}
+	_, _, err := helper.RunCommand("/bin/bash", script, mode, karg)
 	if err != nil {
 		// if grubby is not there log and assume kernel args are set correctly.
 		if utils.IsCommandNotFound(err) {