scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-10-31 18:28:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix "k8s.io/apimachinery/pkg/util/validation" is being imported more than once

Browse Source
This commit is contained in:
shawnhanx
2021-11-08 09:43:44 +08:00
parent fa040a9945
commit d3804784ee
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,7 +21,6 @@ import (
"strings" "strings"
apimachineryvalidation "k8s.io/apimachinery/pkg/api/validation" apimachineryvalidation "k8s.io/apimachinery/pkg/api/validation"
"k8s.io/apimachinery/pkg/util/validation"
utilvalidation "k8s.io/apimachinery/pkg/util/validation" utilvalidation "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/apiserverinternal" "k8s.io/kubernetes/pkg/apis/apiserverinternal"
@@ -143,10 +142,10 @@ func validateStorageVersionCondition(conditions []apiserverinternal.StorageVersi
fmt.Sprintf("the type of the condition is not unique, it also appears in conditions[%d]", ii))) fmt.Sprintf("the type of the condition is not unique, it also appears in conditions[%d]", ii)))
} }
seenType[condition.Type] = i seenType[condition.Type] = i
for _, msg := range validation.IsQualifiedName(string(condition.Type)) { for _, msg := range utilvalidation.IsQualifiedName(string(condition.Type)) {
allErrs = append(allErrs, field.Invalid(fldPath.Index(i).Child("type"), string(condition.Type), msg)) allErrs = append(allErrs, field.Invalid(fldPath.Index(i).Child("type"), string(condition.Type), msg))
} }
for _, msg := range validation.IsQualifiedName(string(condition.Status)) { for _, msg := range utilvalidation.IsQualifiedName(string(condition.Status)) {
allErrs = append(allErrs, field.Invalid(fldPath.Index(i).Child("status"), string(condition.Type), msg)) allErrs = append(allErrs, field.Invalid(fldPath.Index(i).Child("status"), string(condition.Type), msg))
} }
if condition.Reason == "" { if condition.Reason == "" {