github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages 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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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