diff --git a/pkg/apis/core/v1/validation/validation.go b/pkg/apis/core/v1/validation/validation.go index f159fb60f5e..4f7ca42e40f 100644 --- a/pkg/apis/core/v1/validation/validation.go +++ b/pkg/apis/core/v1/validation/validation.go @@ -23,10 +23,10 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/apimachinery/pkg/util/validation" "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/kubernetes/pkg/apis/core/helper" v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" + apivalidation "k8s.io/kubernetes/pkg/apis/core/validation" ) const isNegativeErrorMsg string = `must be greater than or equal to 0` @@ -109,10 +109,7 @@ func ValidateNonnegativeQuantity(value resource.Quantity, fldPath *field.Path) f // Validate compute resource typename. // Refer to docs/design/resources.md for more details. func validateResourceName(value string, fldPath *field.Path) field.ErrorList { - allErrs := field.ErrorList{} - for _, msg := range validation.IsQualifiedName(value) { - allErrs = append(allErrs, field.Invalid(fldPath, value, msg)) - } + allErrs := apivalidation.ValidateQualifiedName(value, fldPath) if len(allErrs) != 0 { return allErrs } diff --git a/pkg/apis/discovery/validation/validation.go b/pkg/apis/discovery/validation/validation.go index 4754c1449e8..a514ef77d8a 100644 --- a/pkg/apis/discovery/validation/validation.go +++ b/pkg/apis/discovery/validation/validation.go @@ -166,9 +166,7 @@ func validatePorts(endpointPorts []discovery.EndpointPort, fldPath *field.Path) } if endpointPort.AppProtocol != nil { - for _, msg := range validation.IsQualifiedName(*endpointPort.AppProtocol) { - allErrs = append(allErrs, field.Invalid(idxPath.Child("appProtocol"), endpointPort.AppProtocol, msg)) - } + allErrs = append(allErrs, apivalidation.ValidateQualifiedName(*endpointPort.AppProtocol, idxPath.Child("appProtocol"))...) } } diff --git a/pkg/apis/storage/validation/validation.go b/pkg/apis/storage/validation/validation.go index 6f4e34e6414..0910a20cb79 100644 --- a/pkg/apis/storage/validation/validation.go +++ b/pkg/apis/storage/validation/validation.go @@ -26,7 +26,6 @@ import ( apimachineryvalidation "k8s.io/apimachinery/pkg/api/validation" metav1validation "k8s.io/apimachinery/pkg/apis/meta/v1/validation" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/apimachinery/pkg/util/validation" "k8s.io/apimachinery/pkg/util/validation/field" api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/apis/core/helper" @@ -91,9 +90,7 @@ func validateProvisioner(provisioner string, fldPath *field.Path) field.ErrorLis allErrs = append(allErrs, field.Required(fldPath, provisioner)) } if len(provisioner) > 0 { - for _, msg := range validation.IsQualifiedName(strings.ToLower(provisioner)) { - allErrs = append(allErrs, field.Invalid(fldPath, provisioner, msg)) - } + allErrs = append(allErrs, apivalidation.ValidateQualifiedName(strings.ToLower(provisioner), fldPath)...) } return allErrs } @@ -401,9 +398,7 @@ func validateCSINodeDriver(driver storage.CSINodeDriver, driverNamesInSpecs sets } topoKeys.Insert(key) - for _, msg := range validation.IsQualifiedName(key) { - allErrs = append(allErrs, field.Invalid(fldPath, driver.TopologyKeys, msg)) - } + allErrs = append(allErrs, apivalidation.ValidateQualifiedName(key, fldPath)...) } return allErrs