Make ovs-vswitchd service 'other_config' option configurable

api/v1/sriovnetworknodestate_types.go

@@ -119,6 +119,9 @@ type System struct {
 	// +kubebuilder:validation:Enum=shared;exclusive
 	//RDMA subsystem. Allowed value "shared", "exclusive".
 	RdmaMode string `json:"rdmaMode,omitempty"`
+	// OVS config. It will be provided for ovs-vswitchd service as other_config option
+	// +kubebuilder:default:={hw-offload: "true"}
+	OvsConfig map[string]string `json:"ovsConfig,omitempty"`
 }
 
 // SriovNetworkNodeStateStatus defines the observed state of SriovNetworkNodeState

api/v1/sriovnetworkpoolconfig_types.go

@@ -34,6 +34,9 @@ type OvsHardwareOffloadConfig struct {
 	// On OpenShift:
 	// Name is the name of MachineConfigPool to be enabled with OVS hardware offload
 	Name string `json:"name,omitempty"`
+	// OVS config. It will be provided for ovs-vswitchd service as other_config option
+	// +kubebuilder:default:={hw-offload: "true"}
+	OvsConfig map[string]string `json:"otherConfig,omitempty"`
 }
 
 // SriovNetworkPoolConfigStatus defines the observed state of SriovNetworkPoolConfig

bindata/manifests/switchdev-config/ovs-units/ovs-vswitchd.service.yaml

@@ -3,4 +3,4 @@ dropins:
 - name: 10-hw-offload.conf
   contents: |
     [Service]
-    ExecStartPre=/bin/ovs-vsctl --no-wait set Open_vSwitch . other_config:hw-offload=true
+    ExecStartPre=/bin/ovs-vsctl -t 5 set Open_vSwitch . external_ids:sriov-operator-owned-keys='{{ .ExternalIds }}' && /bin/ovs-vsctl/ovs-vsctl -t 5 get Open_vSwitch . external_ids:sriov-operator-owned-keys | xargs /bin/ovs-vsctl --no-wait remove Open_vSwitch . other_config && /bin/ovs-vsctl --no-wait set Open_vSwitch . {{ .OtherOvsConfig }}

config/crd/bases/sriovnetwork.openshift.io_sriovnetworknodestates.yaml

@@ -187,6 +187,14 @@ spec:
                 type: array
               system:
                 properties:
+                  ovsConfig:
+                    additionalProperties:
+                      type: string
+                    default:
+                      hw-offload: "true"
+                    description: OVS config. It will be provided for ovs-vswitchd
+                      service as other_config option
+                    type: object
                   rdmaMode:
                     description: RDMA subsystem. Allowed value "shared", "exclusive".
                     enum:
@@ -368,6 +376,14 @@ spec:
                 type: string
               system:
                 properties:
+                  ovsConfig:
+                    additionalProperties:
+                      type: string
+                    default:
+                      hw-offload: "true"
+                    description: OVS config. It will be provided for ovs-vswitchd
+                      service as other_config option
+                    type: object
                   rdmaMode:
                     description: RDMA subsystem. Allowed value "shared", "exclusive".
                     enum:

config/crd/bases/sriovnetwork.openshift.io_sriovnetworkpoolconfigs.yaml

@@ -112,6 +112,14 @@ spec:
                       On OpenShift:
                       Name is the name of MachineConfigPool to be enabled with OVS hardware offload
                     type: string
+                  otherConfig:
+                    additionalProperties:
+                      type: string
+                    default:
+                      hw-offload: "true"
+                    description: OVS config. It will be provided for ovs-vswitchd
+                      service as other_config option
+                    type: object
                 type: object
               rdmaMode:
                 description: RDMA subsystem. Allowed value "shared", "exclusive".

controllers/sriovnetworknodepolicy_controller.go

@@ -308,6 +308,12 @@ func (r *SriovNetworkNodePolicyReconciler) syncAllSriovNetworkNodeStates(ctx con
 		}
 		if netPoolConfig != nil {
 			ns.Spec.System.RdmaMode = netPoolConfig.Spec.RdmaMode
+			if netPoolConfig.Spec.OvsHardwareOffloadConfig.OvsConfig != nil {
+				ns.Spec.System.OvsConfig = make(map[string]string, len(netPoolConfig.Spec.OvsHardwareOffloadConfig.OvsConfig))
+				for k, v := range netPoolConfig.Spec.OvsHardwareOffloadConfig.OvsConfig {
+					ns.Spec.System.OvsConfig[k] = v
+				}
+			}
 		}
 		j, _ := json.Marshal(ns)
 		logger.V(2).Info("SriovNetworkNodeState CR", "content", j)

controllers/sriovnetworkpoolconfig_controller.go

@@ -20,6 +20,7 @@ import (
 	constants "github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/consts"
 	"github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/orchestrator"
 	"github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/render"
+	"github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/utils"
 	"github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/vars"
 )
 
@@ -160,6 +161,9 @@ func (r *SriovNetworkPoolConfigReconciler) syncOvsHardwareOffloadMachineConfigs(
 	}
 
 	data := render.MakeRenderData()
+	externalIds, otherOvsConfig := utils.RenderOtherOvsConfigOption(nc.Spec.OvsHardwareOffloadConfig.OvsConfig)
+	data.Data["OtherOvsConfig"] = otherOvsConfig
+	data.Data["ExternalIds"] = externalIds
 	mc, err := render.GenerateMachineConfig("bindata/manifests/switchdev-config", mcName, mcpName, true, &data)
 	if err != nil {
 		return err

deployment/sriov-network-operator-chart/crds/sriovnetwork.openshift.io_sriovnetworknodestates.yaml

@@ -187,6 +187,14 @@ spec:
                 type: array
               system:
                 properties:
+                  ovsConfig:
+                    additionalProperties:
+                      type: string
+                    default:
+                      hw-offload: "true"
+                    description: OVS config. It will be provided for ovs-vswitchd
+                      service as other_config option
+                    type: object
                   rdmaMode:
                     description: RDMA subsystem. Allowed value "shared", "exclusive".
                     enum:
@@ -368,6 +376,14 @@ spec:
                 type: string
               system:
                 properties:
+                  ovsConfig:
+                    additionalProperties:
+                      type: string
+                    default:
+                      hw-offload: "true"
+                    description: OVS config. It will be provided for ovs-vswitchd
+                      service as other_config option
+                    type: object
                   rdmaMode:
                     description: RDMA subsystem. Allowed value "shared", "exclusive".
                     enum:

deployment/sriov-network-operator-chart/crds/sriovnetwork.openshift.io_sriovnetworkpoolconfigs.yaml

@@ -112,6 +112,14 @@ spec:
                       On OpenShift:
                       Name is the name of MachineConfigPool to be enabled with OVS hardware offload
                     type: string
+                  otherConfig:
+                    additionalProperties:
+                      type: string
+                    default:
+                      hw-offload: "true"
+                    description: OVS config. It will be provided for ovs-vswitchd
+                      service as other_config option
+                    type: object
                 type: object
               rdmaMode:
                 description: RDMA subsystem. Allowed value "shared", "exclusive".

pkg/daemon/daemon_test.go

@@ -139,7 +139,7 @@ var _ = Describe("Daemon Controller", Ordered, func() {
 		// k8s plugin for k8s cluster type
 		if vars.ClusterType == constants.ClusterTypeKubernetes {
 			hostHelper.EXPECT().ReadServiceManifestFile(gomock.Any()).Return(&hostTypes.Service{Name: "test"}, nil).AnyTimes()
-			hostHelper.EXPECT().ReadServiceInjectionManifestFile(gomock.Any()).Return(&hostTypes.Service{Name: "test"}, nil).AnyTimes()
+			hostHelper.EXPECT().ReadServiceInjectionManifestFile(gomock.Any(), gomock.Any()).Return(&hostTypes.Service{Name: "test"}, nil).AnyTimes()
 		}
 
 		platformMock.EXPECT().Init().Return(nil)
@@ -168,6 +168,16 @@ var _ = Describe("Daemon Controller", Ordered, func() {
 		Expect(k8sClient.DeleteAllOf(context.Background(), &sriovnetworkv1.SriovOperatorConfig{}, client.InNamespace(testNamespace))).ToNot(HaveOccurred())
 	})
 
+	Context("Config Daemon generic flow", func() {
+		BeforeEach(func() {
+			// k8s plugin for k8s cluster type
+			if vars.ClusterType == constants.ClusterTypeKubernetes {
+				hostHelper.EXPECT().ReadServiceManifestFile(gomock.Any()).Return(&hostTypes.Service{Name: "test"}, nil).AnyTimes()
+				hostHelper.EXPECT().ReadServiceInjectionManifestFile(gomock.Any(), gomock.Any()).Return(&hostTypes.Service{Name: "test"}, nil).AnyTimes()
+			}
+		})
+	})
+
 	Context("Config Daemon generic flow", func() {
 		It("Should expose nodeState Status section", func(ctx context.Context) {
 			discoverSriovReturn.Store(&[]sriovnetworkv1.InterfaceExt{

pkg/host/internal/service/service.go

@@ -14,6 +14,7 @@ import (
 
 	"github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/consts"
 	"github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/host/types"
+	"github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/render"
 	"github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/utils"
 )
 
@@ -105,6 +106,34 @@ func (s *service) EnableService(service *types.Service) error {
 	return err
 }
 
+// ReloadService reloads a systemd unit files on the host
+func (s *service) ReloadService() error {
+	// Change root dir
+	exit, err := s.utilsHelper.Chroot(consts.Chroot)
+	if err != nil {
+		return err
+	}
+	defer exit()
+
+	// Restart the service
+	_, _, err = s.utilsHelper.RunCommand("systemctl", "daemon-reload")
+	return err
+}
+
+// RestartService restarts systemd service with systemctl restart
+func (s *service) RestartService(service *types.Service) error {
+	// Change root dir
+	exit, err := s.utilsHelper.Chroot(consts.Chroot)
+	if err != nil {
+		return err
+	}
+	defer exit()
+
+	// Restart the service
+	_, _, err = s.utilsHelper.RunCommand("systemctl", "restart", service.Name)
+	return err
+}
+
 // CompareServices returns true if serviceA needs update(doesn't contain all fields from service B)
 func (s *service) CompareServices(serviceA, serviceB *types.Service) (bool, error) {
 	optsA, err := unit.Deserialize(strings.NewReader(serviceA.Content))
@@ -130,8 +159,12 @@ OUTER:
 	return false, nil
 }
 
+func (s *service) renderOtherOvsConfigOption(ovsConfig map[string]string) (string, string) {
+	return utils.RenderOtherOvsConfigOption(ovsConfig)
+}
+
 // ReadServiceInjectionManifestFile reads service injection file
-func (s *service) ReadServiceInjectionManifestFile(path string) (*types.Service, error) {
+func (s *service) ReadServiceInjectionManifestFile(path string, ovsConfig map[string]string) (*types.Service, error) {
 	data, err := os.ReadFile(path)
 	if err != nil {
 		return nil, err
@@ -142,10 +175,20 @@ func (s *service) ReadServiceInjectionManifestFile(path string) (*types.Service,
 		return nil, err
 	}
 
+	d := render.MakeRenderData()
+	externalIds, otherOvsConfig := s.renderOtherOvsConfigOption(ovsConfig)
+	d.Data["ExternalIds"] = externalIds
+	d.Data["OtherOvsConfig"] = otherOvsConfig
+
+	srv, err := render.RenderTemplate(serviceContent.Dropins[0].Contents, &d)
+	if err != nil {
+		return nil, err
+	}
+
 	return &types.Service{
 		Name:    serviceContent.Name,
 		Path:    systemdDir + serviceContent.Name,
-		Content: serviceContent.Dropins[0].Contents,
+		Content: srv.String(),
 	}, nil
 }
 

pkg/host/internal/service/service_suite_test.go

@@ -0,0 +1,21 @@
+package service
+
+import (
+	"testing"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+
+	"go.uber.org/zap/zapcore"
+	"sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+)
+
+func TestSystemd(t *testing.T) {
+	log.SetLogger(zap.New(
+		zap.WriteTo(GinkgoWriter),
+		zap.Level(zapcore.Level(-2)),
+		zap.UseDevMode(true)))
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Package Service Suite")
+}