Refactor validateSriovOperatorConfig

Early exit from the function to make the validation logic more evident and allow further improvements. Signed-off-by: Andrea Panattoni <[email protected]>
k8snetworkplumbingwg · Jun 28, 2023 · 8ea81c0 · 8ea81c0
1 parent e84d536
commit 8ea81c0
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/pkg/webhook/validate.go b/pkg/webhook/validate.go
@@ -35,17 +35,19 @@ func validateSriovOperatorConfig(cr *sriovnetworkv1.SriovOperatorConfig, operati
 	glog.V(2).Infof("validateSriovOperatorConfig: %v", cr)
 	var warnings []string
 
-	if cr.GetName() == constants.DefaultConfigName {
-		if operation == v1.Delete {
-			return false, warnings, fmt.Errorf("default SriovOperatorConfig shouldn't be deleted")
-		}
+	if cr.GetName() != constants.DefaultConfigName {
+		return false, warnings, fmt.Errorf("only default SriovOperatorConfig is used")
+	}
 
-		if cr.Spec.DisableDrain {
-			warnings = append(warnings, "Node draining is disabled for applying SriovNetworkNodePolicy, it may result in workload interruption.")
-		}
-		return true, warnings, nil
+	if operation == v1.Delete {
+		return false, warnings, fmt.Errorf("default SriovOperatorConfig shouldn't be deleted")
+	}
+
+	if cr.Spec.DisableDrain {
+		warnings = append(warnings, "Node draining is disabled for applying SriovNetworkNodePolicy, it may result in workload interruption.")
 	}
-	return false, warnings, fmt.Errorf("only default SriovOperatorConfig is used")
+
+	return true, warnings, nil
 }
 
 func validateSriovNetworkNodePolicy(cr *sriovnetworkv1.SriovNetworkNodePolicy, operation v1.Operation) (bool, []string, error) {