Merge pull request #497 from e0ne/parallel-nic-config

Parallel NICs configuration
k8snetworkplumbingwg · Feb 15, 2024 · 3852228 · 3852228
2 parents 1163ef9 + 0aead49
commit 3852228
Show file tree

Hide file tree

Showing 10 changed files with 238 additions and 59 deletions.
diff --git a/api/v1/sriovoperatorconfig_types.go b/api/v1/sriovoperatorconfig_types.go
@@ -63,6 +63,8 @@ type SriovOperatorConfigSpec struct {
 	UseCDI bool `json:"useCDI,omitempty"`
 	// DisablePlugins is a list of sriov-network-config-daemon plugins to disable
 	DisablePlugins PluginNameSlice `json:"disablePlugins,omitempty"`
+	// FeatureGates to enable experimental features
+	FeatureGates map[string]bool `json:"featureGates,omitempty"`
 }
 
 // SriovOperatorConfigStatus defines the observed state of SriovOperatorConfig

diff --git a/api/v1/zz_generated.deepcopy.go b/api/v1/zz_generated.deepcopy.go
diff --git a/bindata/manifests/daemon/daemonset.yaml b/bindata/manifests/daemon/daemonset.yaml
@@ -102,6 +102,9 @@ spec:
         {{- with index . "DisablePlugins" }}
           - --disable-plugins={{.}}
         {{- end }}
+        {{- if .ParallelNicConfig }}
+        - --parallel-nic-config
+        {{- end }}
         env:
           - name: NODE_NAME
             valueFrom:

diff --git a/cmd/sriov-network-config-daemon/start.go b/cmd/sriov-network-config-daemon/start.go
@@ -78,10 +78,11 @@ var (
 	}
 
 	startOpts struct {
-		kubeconfig      string
-		nodeName        string
-		systemd         bool
-		disabledPlugins stringList
+		kubeconfig        string
+		nodeName          string
+		systemd           bool
+		disabledPlugins   stringList
+		parallelNicConfig bool
 	}
 )
 
@@ -91,6 +92,7 @@ func init() {
 	startCmd.PersistentFlags().StringVar(&startOpts.nodeName, "node-name", "", "kubernetes node name daemon is managing")
 	startCmd.PersistentFlags().BoolVar(&startOpts.systemd, "use-systemd-service", false, "use config daemon in systemd mode")
 	startCmd.PersistentFlags().VarP(&startOpts.disabledPlugins, "disable-plugins", "", "comma-separated list of plugins to disable")
+	startCmd.PersistentFlags().BoolVar(&startOpts.parallelNicConfig, "parallel-nic-config", false, "perform NIC configuration in parallel")
 }
 
 func runStartCmd(cmd *cobra.Command, args []string) error {
@@ -104,6 +106,8 @@ func runStartCmd(cmd *cobra.Command, args []string) error {
 		vars.UsingSystemdMode = true
 	}
 
+	vars.ParallelNicConfig = startOpts.parallelNicConfig
+
 	if startOpts.nodeName == "" {
 		name, ok := os.LookupEnv("NODE_NAME")
 		if !ok || name == "" {

diff --git a/config/crd/bases/sriovnetwork.openshift.io_sriovoperatorconfigs.yaml b/config/crd/bases/sriovnetwork.openshift.io_sriovoperatorconfigs.yaml
@@ -74,6 +74,11 @@ spec:
                   provision switchdev-configuration.service and enable OpenvSwitch
                   hw-offload on nodes.
                 type: boolean
+              featureGates:
+                additionalProperties:
+                  type: boolean
+                description: FeatureGates to enable experimental features
+                type: object
               logLevel:
                 description: Flag to control the log verbose level of the operator.
                   Set to '0' to show only the basic logs. And set to '2' to show all

diff --git a/controllers/sriovoperatorconfig_controller.go b/controllers/sriovoperatorconfig_controller.go
@@ -187,6 +187,10 @@ func (r *SriovOperatorConfigReconciler) syncConfigDaemonSet(ctx context.Context,
 	} else {
 		data.Data["UsedSystemdMode"] = false
 	}
+	data.Data["ParallelNicConfig"] = false
+	if parallelConfig, ok := dc.Spec.FeatureGates[consts.ParallelNicConfigFeatureGate]; ok {
+		data.Data["ParallelNicConfig"] = parallelConfig
+	}
 
 	envCniBinPath := os.Getenv("SRIOV_CNI_BIN_PATH")
 	if envCniBinPath == "" {

diff --git a/deployment/sriov-network-operator/crds/sriovnetwork.openshift.io_sriovoperatorconfigs.yaml b/deployment/sriov-network-operator/crds/sriovnetwork.openshift.io_sriovoperatorconfigs.yaml
@@ -74,6 +74,11 @@ spec:
                   provision switchdev-configuration.service and enable OpenvSwitch
                   hw-offload on nodes.
                 type: boolean
+              featureGates:
+                additionalProperties:
+                  type: boolean
+                description: FeatureGates to enable experimental features
+                type: object
               logLevel:
                 description: Flag to control the log verbose level of the operator.
                   Set to '0' to show only the basic logs. And set to '2' to show all

diff --git a/pkg/consts/constants.go b/pkg/consts/constants.go
@@ -110,6 +110,8 @@ const (
 	KernelArgPciRealloc = "pci=realloc"
 	KernelArgIntelIommu = "intel_iommu=on"
 	KernelArgIommuPt    = "iommu=pt"
+
+	ParallelNicConfigFeatureGate = "parallelNicConfig"
 )
 
 const (