From 4de0d2c6f8fa78676f9c1a61f9db65a87de37193 Mon Sep 17 00:00:00 2001 From: charles-chenzz Date: Sat, 1 Apr 2023 11:39:46 +0800 Subject: [PATCH] use generic set in storage/validation --- pkg/apis/storage/validation/validation.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/apis/storage/validation/validation.go b/pkg/apis/storage/validation/validation.go index e7b68044cb2..4a76a8f4954 100644 --- a/pkg/apis/storage/validation/validation.go +++ b/pkg/apis/storage/validation/validation.go @@ -325,7 +325,7 @@ func validateCSINodeSpec( // ValidateCSINodeDrivers tests that the specified CSINodeDrivers have valid data. func validateCSINodeDrivers(drivers []storage.CSINodeDriver, fldPath *field.Path, validationOpts CSINodeValidationOptions) field.ErrorList { allErrs := field.ErrorList{} - driverNamesInSpecs := make(sets.String) + driverNamesInSpecs := sets.New[string]() for i, driver := range drivers { idxPath := fldPath.Index(i) allErrs = append(allErrs, validateCSINodeDriver(driver, driverNamesInSpecs, idxPath, validationOpts)...) @@ -370,7 +370,7 @@ func validateCSINodeDriverAllocatable(a *storage.VolumeNodeResources, fldPath *f } // 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 { allErrs := field.ErrorList{} @@ -383,7 +383,7 @@ func validateCSINodeDriver(driver storage.CSINodeDriver, driverNamesInSpecs sets allErrs = append(allErrs, field.Duplicate(fldPath.Child("name"), driver.Name)) } driverNamesInSpecs.Insert(driver.Name) - topoKeys := make(sets.String) + topoKeys := sets.New[string]() for _, key := range driver.TopologyKeys { if len(key) == 0 { allErrs = append(allErrs, field.Required(fldPath, key))