From 2f920a8eb56d427177d1c1128982acc6b739dab4 Mon Sep 17 00:00:00 2001 From: Michal Szadkowski Date: Fri, 13 Sep 2024 13:14:30 +0200 Subject: [PATCH] Fix the naming and call validate always Signed-off-by: Michal Szadkowski --- pkg/common/util/webhooks.go | 2 +- pkg/webhooks/paddlepaddle/paddlepaddle_webhook.go | 4 +--- pkg/webhooks/pytorch/pytorchjob_webhook.go | 3 +-- pkg/webhooks/tensorflow/tfjob_webhook.go | 3 +-- pkg/webhooks/xgboost/xgboostjob_webhook.go | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/pkg/common/util/webhooks.go b/pkg/common/util/webhooks.go index 46693239bb..aa4031cffe 100644 --- 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 index 8f584003e9..fedc95b5f7 100644 --- 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 index e8511ff18b..2459815935 100644 --- 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 index 499ff986cd..95f187f44f 100644 --- 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 index a411a4c87c..5372317487 100644 --- 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 }