Fix the naming and call validate always

Signed-off-by: Michal Szadkowski <[email protected]>
kubeflow · Sep 13, 2024 · 2f920a8 · 2f920a8
1 parent 18a5313
commit 2f920a8
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 10 deletions.
diff --git a/pkg/common/util/webhooks.go b/pkg/common/util/webhooks.go
@@ -12,7 +12,7 @@ var supportedJobControllers = sets.New(
 	v1.MultiKueueController,
 	v1.KubeflowJobsController)
 
-func ValidateRunPolicyCreate(runPolicy *v1.RunPolicy) field.ErrorList {
+func ValidateRunPolicy(runPolicy *v1.RunPolicy) field.ErrorList {
 	errs := field.ErrorList{}
 	if runPolicy.ManagedBy != nil {
 		manager := *runPolicy.ManagedBy

diff --git a/pkg/webhooks/paddlepaddle/paddlepaddle_webhook.go b/pkg/webhooks/paddlepaddle/paddlepaddle_webhook.go
@@ -76,12 +76,10 @@ func validatePaddleJob(oldJob, newJob *trainingoperator.PaddleJob) field.ErrorLi
 	if errors := apimachineryvalidation.NameIsDNS1035Label(newJob.Name, false); len(errors) != 0 {
 		allErrs = append(allErrs, field.Invalid(field.NewPath("metadata").Child("name"), newJob.Name, fmt.Sprintf("should match: %v", strings.Join(errors, ","))))
 	}
-
 	if oldJob != nil {
 		allErrs = append(allErrs, util.ValidateRunPolicyUpdate(&oldJob.Spec.RunPolicy, &newJob.Spec.RunPolicy)...)
-	} else {
-		allErrs = append(allErrs, util.ValidateRunPolicyCreate(&newJob.Spec.RunPolicy)...)
 	}
+	allErrs = append(allErrs, util.ValidateRunPolicy(&newJob.Spec.RunPolicy)...)
 	allErrs = append(allErrs, validateSpec(newJob.Spec.PaddleReplicaSpecs)...)
 	return allErrs
 }

diff --git a/pkg/webhooks/pytorch/pytorchjob_webhook.go b/pkg/webhooks/pytorch/pytorchjob_webhook.go
@@ -82,9 +82,8 @@ func validatePyTorchJob(oldJob, newJob *trainingoperator.PyTorchJob) (admission.
 	}
 	if oldJob != nil {
 		allErrs = append(allErrs, util.ValidateRunPolicyUpdate(&oldJob.Spec.RunPolicy, &newJob.Spec.RunPolicy)...)
-	} else {
-		allErrs = append(allErrs, util.ValidateRunPolicyCreate(&newJob.Spec.RunPolicy)...)
 	}
+	allErrs = append(allErrs, util.ValidateRunPolicy(&newJob.Spec.RunPolicy)...)
 	ws, err := validateSpec(newJob.Spec)
 	warnings = append(warnings, ws...)
 	allErrs = append(allErrs, err...)

diff --git a/pkg/webhooks/tensorflow/tfjob_webhook.go b/pkg/webhooks/tensorflow/tfjob_webhook.go
@@ -77,9 +77,8 @@ func validateTFJob(oldJob, newJob *trainingoperator.TFJob) field.ErrorList {
 	}
 	if oldJob != nil {
 		allErrs = append(allErrs, util.ValidateRunPolicyUpdate(&oldJob.Spec.RunPolicy, &newJob.Spec.RunPolicy)...)
-	} else {
-		allErrs = append(allErrs, util.ValidateRunPolicyCreate(&newJob.Spec.RunPolicy)...)
 	}
+	allErrs = append(allErrs, util.ValidateRunPolicy(&newJob.Spec.RunPolicy)...)
 	allErrs = append(allErrs, validateSpec(newJob.Spec)...)
 	return allErrs
 }

diff --git a/pkg/webhooks/xgboost/xgboostjob_webhook.go b/pkg/webhooks/xgboost/xgboostjob_webhook.go
@@ -78,9 +78,8 @@ func validateXGBoostJob(oldJob, newJob *trainingoperator.XGBoostJob) field.Error
 	}
 	if oldJob != nil {
 		allErrs = append(allErrs, util.ValidateRunPolicyUpdate(&oldJob.Spec.RunPolicy, &newJob.Spec.RunPolicy)...)
-	} else {
-		allErrs = append(allErrs, util.ValidateRunPolicyCreate(&newJob.Spec.RunPolicy)...)
 	}
+	allErrs = append(allErrs, util.ValidateRunPolicy(&newJob.Spec.RunPolicy)...)
 	allErrs = append(allErrs, validateSpec(newJob.Spec)...)
 	return allErrs
 }