Skip to content

Commit

Permalink
validation logic fixed
Browse files Browse the repository at this point in the history
Signed-off-by: Shashank Mittal <[email protected]>
  • Loading branch information
shashank-iitbhu committed Aug 15, 2024
1 parent 19a93bc commit ff9137b
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
16 changes: 9 additions & 7 deletions pkg/webhook/v1beta1/experiment/validator/validator.go
Original file line number Diff line number Diff line change
Expand Up @@ -265,13 +265,15 @@ func (g *DefaultValidator) validateParameters(parameters []experimentsv1beta1.Pa
param.ParameterType, fmt.Sprintf("parameterType: %v is not supported", param.ParameterType)))
}

if param.FeasibleSpace.Distribution != experimentsv1beta1.DistributionUniform &&
param.FeasibleSpace.Distribution != experimentsv1beta1.DistributionLogUniform &&
param.FeasibleSpace.Distribution != experimentsv1beta1.DistributionNormal &&
param.FeasibleSpace.Distribution != experimentsv1beta1.DistributionLogNormal &&
param.FeasibleSpace.Distribution != experimentsv1beta1.DistributionUnknown {
allErrs = append(allErrs, field.Invalid(parametersPath.Index(i).Child("feasibleSpace").Child("distribution"),
param.FeasibleSpace.Distribution, fmt.Sprintf("distribution: %v is not supported", param.FeasibleSpace.Distribution)))
if param.FeasibleSpace.Distribution != "" {
if param.FeasibleSpace.Distribution != experimentsv1beta1.DistributionUniform &&
param.FeasibleSpace.Distribution != experimentsv1beta1.DistributionLogUniform &&
param.FeasibleSpace.Distribution != experimentsv1beta1.DistributionNormal &&
param.FeasibleSpace.Distribution != experimentsv1beta1.DistributionLogNormal &&
param.FeasibleSpace.Distribution != experimentsv1beta1.DistributionUnknown {
allErrs = append(allErrs, field.Invalid(parametersPath.Index(i).Child("feasibleSpace").Child("distribution"),
param.FeasibleSpace.Distribution, fmt.Sprintf("distribution: %v is not supported", param.FeasibleSpace.Distribution)))
}
}

if equality.Semantic.DeepEqual(param.FeasibleSpace, experimentsv1beta1.FeasibleSpace{}) {
Expand Down
3 changes: 2 additions & 1 deletion pkg/webhook/v1beta1/experiment/validator/validator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ package validator

import (
"errors"
"testing"

"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
experimentutil "github.com/kubeflow/katib/pkg/controller.v1beta1/experiment/util"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/apimachinery/pkg/util/validation/field"
"testing"

"go.uber.org/mock/gomock"
batchv1 "k8s.io/api/batch/v1"
Expand Down

0 comments on commit ff9137b

Please sign in to comment.