use disableDrain from vars

Signed-off-by: Sebastian Sch <[email protected]>

Author: SchSeba

cmd/sriov-network-config-daemon/start.go

@@ -182,30 +182,17 @@ func getOperatorConfig(kClient runtimeclient.Client) (*sriovnetworkv1.SriovOpera
 	return defaultConfig, nil
 }
 
-func initFeatureGates(kClient runtimeclient.Client) (featuregate.FeatureGate, error) {
+func initFeatureGates(defaultConfig *sriovnetworkv1.SriovOperatorConfig) (featuregate.FeatureGate, error) {
 	fnLogger := log.Log.WithName("initFeatureGates")
-	// Init feature gates once to prevent race conditions.
-	defaultConfig, err := getOperatorConfig(kClient)
-	if err != nil {
-		fnLogger.Error(err, "Failed to get default SriovOperatorConfig object")
-		return nil, err
-	}
 	featureGates := featuregate.New()
 	featureGates.Init(defaultConfig.Spec.FeatureGates)
 	fnLogger.Info("Enabled featureGates", "featureGates", featureGates.String())
 
 	return featureGates, nil
 }
 
-func initLogLevel(kClient runtimeclient.Client) error {
+func initLogLevel(defaultConfig *sriovnetworkv1.SriovOperatorConfig) error {
 	fnLogger := log.Log.WithName("initLogLevel")
-	// Init feature gates once to prevent race conditions.
-	defaultConfig, err := getOperatorConfig(kClient)
-	if err != nil {
-		fnLogger.Error(err, "Failed to get default SriovOperatorConfig object")
-		return err
-	}
-	fnLogger.V(2).Info("DEBUG", defaultConfig)
 	snolog.SetLogLevel(defaultConfig.Spec.LogLevel)
 	fnLogger.V(2).Info("logLevel sets", "logLevel", defaultConfig.Spec.LogLevel)
 	return nil
@@ -292,17 +279,28 @@ func runStartCmd(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	fg, err := initFeatureGates(kClient)
+	operatorConfig, err := getOperatorConfig(kClient)
+	if err != nil {
+		setupLog.Error(err, "Failed to get operator config object")
+		return err
+	}
+
+	// init feature gates
+	fg, err := initFeatureGates(operatorConfig)
 	if err != nil {
 		setupLog.Error(err, "failed to initialize feature gates")
 		return err
 	}
 
-	if err := initLogLevel(kClient); err != nil {
+	// init log level
+	if err := initLogLevel(operatorConfig); err != nil {
 		setupLog.Error(err, "failed to initialize log level")
 		return err
 	}
 
+	// init disable drain
+	vars.DisableDrain = operatorConfig.Spec.DisableDrain
+
 	// Init manager
 	setupLog.V(0).Info("Starting SR-IOV Network Config Daemon")
 	nodeStateSelector, err := fields.ParseSelector(fmt.Sprintf("metadata.name=%s,metadata.namespace=%s", vars.NodeName, vars.Namespace))

pkg/daemon/daemon.go

@@ -45,7 +45,6 @@ type NodeReconciler struct {
 
 	loadedPlugins         map[string]plugin.VendorPlugin
 	lastAppliedGeneration int64
-	disableDrain          bool
 }
 
 // New creates a new instance of NodeReconciler.
@@ -251,7 +250,7 @@ func (dn *NodeReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl
 	}
 
 	reqLogger.V(0).Info("aggregated daemon node state requirement",
-		"drain-required", reqDrain, "reboot-required", reqReboot, "disable-drain", dn.disableDrain)
+		"drain-required", reqDrain, "reboot-required", reqReboot, "disable-drain", vars.DisableDrain)
 
 	// handle drain only if the plugins request drain, or we are already in a draining request state
 	if reqDrain ||
@@ -523,7 +522,7 @@ func (dn *NodeReconciler) handleDrain(ctx context.Context, desiredNodeState *sri
 	}
 
 	// drain is disabled we continue with the configuration
-	if dn.disableDrain {
+	if vars.DisableDrain {
 		funcLog.Info("drain is disabled in sriovOperatorConfig")
 		return false, nil
 	}