github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 18:00:08 +00:00
Code Issues Projects Releases Wiki Activity

Change the users of IsQualifiedName to ValidateQualifiedName

Browse Source
This commit is contained in:
creydr 2021-05-17 21:12:42 +02:00
parent 2d58b72889
commit f38615fb9d
3 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/apis/core/v1/validation/validation.go
View File

@ -23,10 +23,10 @@ import (
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/validation"
"k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/kubernetes/pkg/apis/core/helper" "k8s.io/kubernetes/pkg/apis/core/helper"
v1helper "k8s.io/kubernetes/pkg/apis/core/v1/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` 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. // Validate compute resource typename.
// Refer to docs/design/resources.md for more details. // Refer to docs/design/resources.md for more details.
func validateResourceName(value string, fldPath *field.Path) field.ErrorList { func validateResourceName(value string, fldPath *field.Path) field.ErrorList {
allErrs := field.ErrorList{} allErrs := apivalidation.ValidateQualifiedName(value, fldPath)
for _, msg := range validation.IsQualifiedName(value) {
allErrs = append(allErrs, field.Invalid(fldPath, value, msg))
}
if len(allErrs) != 0 { if len(allErrs) != 0 {
return allErrs return allErrs
} }

4
pkg/apis/discovery/validation/validation.go
View File

@ -166,9 +166,7 @@ func validatePorts(endpointPorts []discovery.EndpointPort, fldPath *field.Path)
} }
if endpointPort.AppProtocol != nil { if endpointPort.AppProtocol != nil {
for _, msg := range validation.IsQualifiedName(*endpointPort.AppProtocol) { allErrs = append(allErrs, apivalidation.ValidateQualifiedName(*endpointPort.AppProtocol, idxPath.Child("appProtocol"))...)
allErrs = append(allErrs, field.Invalid(idxPath.Child("appProtocol"), endpointPort.AppProtocol, msg))
}
} }
} }

9
pkg/apis/storage/validation/validation.go
View File

@ -26,7 +26,6 @@ import (
apimachineryvalidation "k8s.io/apimachinery/pkg/api/validation" apimachineryvalidation "k8s.io/apimachinery/pkg/api/validation"
metav1validation "k8s.io/apimachinery/pkg/apis/meta/v1/validation" metav1validation "k8s.io/apimachinery/pkg/apis/meta/v1/validation"
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/validation"
"k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/apimachinery/pkg/util/validation/field"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/apis/core/helper" "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)) allErrs = append(allErrs, field.Required(fldPath, provisioner))
} }
if len(provisioner) > 0 { if len(provisioner) > 0 {
for _, msg := range validation.IsQualifiedName(strings.ToLower(provisioner)) { allErrs = append(allErrs, apivalidation.ValidateQualifiedName(strings.ToLower(provisioner), fldPath)...)
allErrs = append(allErrs, field.Invalid(fldPath, provisioner, msg))
}
} }
return allErrs return allErrs
} }
@ -401,9 +398,7 @@ func validateCSINodeDriver(driver storage.CSINodeDriver, driverNamesInSpecs sets
} }
topoKeys.Insert(key) topoKeys.Insert(key)
for _, msg := range validation.IsQualifiedName(key) { allErrs = append(allErrs, apivalidation.ValidateQualifiedName(key, fldPath)...)
allErrs = append(allErrs, field.Invalid(fldPath, driver.TopologyKeys, msg))
}
} }
return allErrs return allErrs