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

Merge pull request #117047 from charles-chenzz/add_continue

Browse Source 
replace deprecated set.String in storage/validation
This commit is contained in:
Kubernetes Prow Robot 2023-05-24 02:48:49 -07:00 committed by GitHub
commit b2522655b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -325,7 +325,7 @@ func validateCSINodeSpec(
// ValidateCSINodeDrivers tests that the specified CSINodeDrivers have valid data. // ValidateCSINodeDrivers tests that the specified CSINodeDrivers have valid data.
func validateCSINodeDrivers(drivers []storage.CSINodeDriver, fldPath *field.Path, validationOpts CSINodeValidationOptions) field.ErrorList { func validateCSINodeDrivers(drivers []storage.CSINodeDriver, fldPath *field.Path, validationOpts CSINodeValidationOptions) field.ErrorList {
allErrs := field.ErrorList{} allErrs := field.ErrorList{}
driverNamesInSpecs := make(sets.String) driverNamesInSpecs := sets.New[string]()
for i, driver := range drivers { for i, driver := range drivers {
idxPath := fldPath.Index(i) idxPath := fldPath.Index(i)
allErrs = append(allErrs, validateCSINodeDriver(driver, driverNamesInSpecs, idxPath, validationOpts)...) allErrs = append(allErrs, validateCSINodeDriver(driver, driverNamesInSpecs, idxPath, validationOpts)...)
@ -365,7 +365,7 @@ func validateCSINodeDriverAllocatable(a *storage.VolumeNodeResources, fldPath *f
} }
// validateCSINodeDriver tests if CSINodeDriver has valid entries // validateCSINodeDriver tests if CSINodeDriver has valid entries
func validateCSINodeDriver(driver storage.CSINodeDriver, driverNamesInSpecs sets.String, fldPath *field.Path, func validateCSINodeDriver(driver storage.CSINodeDriver, driverNamesInSpecs sets.Set[string], fldPath *field.Path,
validationOpts CSINodeValidationOptions) field.ErrorList { validationOpts CSINodeValidationOptions) field.ErrorList {
allErrs := field.ErrorList{} allErrs := field.ErrorList{}
@ -378,7 +378,7 @@ func validateCSINodeDriver(driver storage.CSINodeDriver, driverNamesInSpecs sets
allErrs = append(allErrs, field.Duplicate(fldPath.Child("name"), driver.Name)) allErrs = append(allErrs, field.Duplicate(fldPath.Child("name"), driver.Name))
} }
driverNamesInSpecs.Insert(driver.Name) driverNamesInSpecs.Insert(driver.Name)
topoKeys := make(sets.String) topoKeys := sets.New[string]()
for _, key := range driver.TopologyKeys { for _, key := range driver.TopologyKeys {
if len(key) == 0 { if len(key) == 0 {
allErrs = append(allErrs, field.Required(fldPath, key)) allErrs = append(allErrs, field.Required(fldPath, key))