github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #118520 from jpbetz/validate-unique

Browse Source 
Add merge map key validation to StorageVersions
This commit is contained in:
Kubernetes Prow Robot
2023-07-13 14:43:49 -07:00
committed by GitHub
parent bea27f82d3 b5db644422
commit fc798a8dc1
2 changed files with 61 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/apis/apiserverinternal/validation/validation.go
View File

@@ -21,6 +21,7 @@ import (
"strings"
apimachineryvalidation "k8s.io/apimachinery/pkg/api/validation"
"k8s.io/apimachinery/pkg/util/sets"
utilvalidation "k8s.io/apimachinery/pkg/util/validation"
"k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/kubernetes/pkg/apis/apiserverinternal"
@@ -67,7 +68,13 @@ func ValidateStorageVersionStatusUpdate(sv, oldSV *apiserverinternal.StorageVers
func validateStorageVersionStatus(ss apiserverinternal.StorageVersionStatus, fldPath *field.Path) field.ErrorList {
var allErrs field.ErrorList
allAPIServerIDs := sets.New[string]()
for i, ssv := range ss.StorageVersions {
if allAPIServerIDs.Has(ssv.APIServerID) {
allErrs = append(allErrs, field.Duplicate(fldPath.Child("storageVersions").Index(i).Child("apiServerID"), ssv.APIServerID))
} else {
allAPIServerIDs.Insert(ssv.APIServerID)
}
allErrs = append(allErrs, validateServerStorageVersion(ssv, fldPath.Child("storageVersions").Index(i))...)
}
if err := validateCommonVersion(ss, fldPath); err != nil {