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

Merge pull request #106215 from shawnhanx/apiserverinternal_validation

Browse Source 
fix "k8s.io/apimachinery/pkg/util/validation" is imported more than once
This commit is contained in:
Kubernetes Prow Robot
2022-01-05 09:22:51 -08:00
committed by GitHub
parent 24a43bc6a6 d3804784ee
commit e720bae30e
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 == "" {