diff --git a/pkg/api/pod/util.go b/pkg/api/pod/util.go index dd6922ee376..725bd593553 100644 --- a/pkg/api/pod/util.go +++ b/pkg/api/pod/util.go @@ -26,7 +26,6 @@ import ( api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/apis/core/helper" v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" - "k8s.io/kubernetes/pkg/apis/core/validation" apivalidation "k8s.io/kubernetes/pkg/apis/core/validation" "k8s.io/kubernetes/pkg/features" ) @@ -394,7 +393,7 @@ func usesIndivisibleHugePagesValues(podSpec *api.PodSpec) bool { // GetValidationOptionsFromPodSpecAndMeta returns validation options based on pod specs and metadata func GetValidationOptionsFromPodSpecAndMeta(podSpec, oldPodSpec *api.PodSpec, podMeta, oldPodMeta *metav1.ObjectMeta) apivalidation.PodValidationOptions { // default pod validation options based on feature gate - opts := validation.PodValidationOptions{ + opts := apivalidation.PodValidationOptions{ // Allow multiple huge pages on pod create if feature is enabled AllowMultipleHugePageResources: utilfeature.DefaultFeatureGate.Enabled(features.HugePageStorageMediumSize), // Allow pod spec to use hugepages in downward API if feature is enabled diff --git a/pkg/api/pod/util_test.go b/pkg/api/pod/util_test.go index 11e254f9908..f3823633ed6 100644 --- a/pkg/api/pod/util_test.go +++ b/pkg/api/pod/util_test.go @@ -31,7 +31,6 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" utilfeature "k8s.io/apiserver/pkg/util/feature" featuregatetesting "k8s.io/component-base/featuregate/testing" - "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/features" ) @@ -1445,19 +1444,19 @@ func TestValidatePodDeletionCostOption(t *testing.T) { }, { name: "UpdateFeatureDisabled", - oldPodMeta: &metav1.ObjectMeta{Annotations: map[string]string{core.PodDeletionCost: "100"}}, + oldPodMeta: &metav1.ObjectMeta{Annotations: map[string]string{api.PodDeletionCost: "100"}}, featureEnabled: false, wantAllowInvalidPodDeletionCost: true, }, { name: "UpdateFeatureEnabledValidOldValue", - oldPodMeta: &metav1.ObjectMeta{Annotations: map[string]string{core.PodDeletionCost: "100"}}, + oldPodMeta: &metav1.ObjectMeta{Annotations: map[string]string{api.PodDeletionCost: "100"}}, featureEnabled: true, wantAllowInvalidPodDeletionCost: false, }, { name: "UpdateFeatureEnabledValidOldValue", - oldPodMeta: &metav1.ObjectMeta{Annotations: map[string]string{core.PodDeletionCost: "invalid-value"}}, + oldPodMeta: &metav1.ObjectMeta{Annotations: map[string]string{api.PodDeletionCost: "invalid-value"}}, featureEnabled: true, wantAllowInvalidPodDeletionCost: true, }, diff --git a/pkg/apis/certificates/validation/validation_test.go b/pkg/apis/certificates/validation/validation_test.go index 6c197e0e4bc..dd1e055901e 100644 --- a/pkg/apis/certificates/validation/validation_test.go +++ b/pkg/apis/certificates/validation/validation_test.go @@ -31,7 +31,6 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/validation/field" - "k8s.io/kubernetes/pkg/apis/certificates" capi "k8s.io/kubernetes/pkg/apis/certificates" capiv1beta1 "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" "k8s.io/kubernetes/pkg/apis/core" @@ -357,8 +356,8 @@ func Test_getValidationOptions(t *testing.T) { tests := []struct { name string version schema.GroupVersion - newCSR *certificates.CertificateSigningRequest - oldCSR *certificates.CertificateSigningRequest + newCSR *capi.CertificateSigningRequest + oldCSR *capi.CertificateSigningRequest want certificateValidationOptions }{ { @@ -510,8 +509,8 @@ func TestValidateCertificateSigningRequestUpdate(t *testing.T) { tests := []struct { name string - newCSR *certificates.CertificateSigningRequest - oldCSR *certificates.CertificateSigningRequest + newCSR *capi.CertificateSigningRequest + oldCSR *capi.CertificateSigningRequest versionErrs map[string][]string }{ { @@ -604,7 +603,7 @@ func TestValidateCertificateSigningRequestUpdate(t *testing.T) { for _, version := range []string{"v1", "v1beta1"} { t.Run(tt.name+"_"+version, func(t *testing.T) { gotErrs := sets.NewString() - for _, err := range ValidateCertificateSigningRequestUpdate(tt.newCSR, tt.oldCSR, schema.GroupVersion{Group: certificates.GroupName, Version: version}) { + for _, err := range ValidateCertificateSigningRequestUpdate(tt.newCSR, tt.oldCSR, schema.GroupVersion{Group: capi.GroupName, Version: version}) { gotErrs.Insert(err.Error()) } wantErrs := sets.NewString(tt.versionErrs[version]...) @@ -634,8 +633,8 @@ func TestValidateCertificateSigningRequestStatusUpdate(t *testing.T) { tests := []struct { name string - newCSR *certificates.CertificateSigningRequest - oldCSR *certificates.CertificateSigningRequest + newCSR *capi.CertificateSigningRequest + oldCSR *capi.CertificateSigningRequest versionErrs map[string][]string }{ { @@ -760,7 +759,7 @@ func TestValidateCertificateSigningRequestStatusUpdate(t *testing.T) { for _, version := range []string{"v1", "v1beta1"} { t.Run(tt.name+"_"+version, func(t *testing.T) { gotErrs := sets.NewString() - for _, err := range ValidateCertificateSigningRequestStatusUpdate(tt.newCSR, tt.oldCSR, schema.GroupVersion{Group: certificates.GroupName, Version: version}) { + for _, err := range ValidateCertificateSigningRequestStatusUpdate(tt.newCSR, tt.oldCSR, schema.GroupVersion{Group: capi.GroupName, Version: version}) { gotErrs.Insert(err.Error()) } wantErrs := sets.NewString(tt.versionErrs[version]...) @@ -790,8 +789,8 @@ func TestValidateCertificateSigningRequestApprovalUpdate(t *testing.T) { tests := []struct { name string - newCSR *certificates.CertificateSigningRequest - oldCSR *certificates.CertificateSigningRequest + newCSR *capi.CertificateSigningRequest + oldCSR *capi.CertificateSigningRequest versionErrs map[string][]string }{ { @@ -876,7 +875,7 @@ func TestValidateCertificateSigningRequestApprovalUpdate(t *testing.T) { for _, version := range []string{"v1", "v1beta1"} { t.Run(tt.name+"_"+version, func(t *testing.T) { gotErrs := sets.NewString() - for _, err := range ValidateCertificateSigningRequestApprovalUpdate(tt.newCSR, tt.oldCSR, schema.GroupVersion{Group: certificates.GroupName, Version: version}) { + for _, err := range ValidateCertificateSigningRequestApprovalUpdate(tt.newCSR, tt.oldCSR, schema.GroupVersion{Group: capi.GroupName, Version: version}) { gotErrs.Insert(err.Error()) } wantErrs := sets.NewString(tt.versionErrs[version]...) @@ -904,7 +903,7 @@ func Test_validateCertificateSigningRequestOptions(t *testing.T) { name string // csr being validated - csr *certificates.CertificateSigningRequest + csr *capi.CertificateSigningRequest // options that allow the csr to pass validation lenientOpts certificateValidationOptions diff --git a/pkg/apis/core/validation/events.go b/pkg/apis/core/validation/events.go index 0aa0bde368a..91b3ffb8231 100644 --- a/pkg/apis/core/validation/events.go +++ b/pkg/apis/core/validation/events.go @@ -109,7 +109,7 @@ func validateV1EventSeries(event *core.Event) field.ErrorList { zeroTime := time.Time{} if event.Series != nil { if event.Series.Count < 2 { - allErrs = append(allErrs, field.Invalid(field.NewPath("series.count"), "", fmt.Sprintf("should be at least 2"))) + allErrs = append(allErrs, field.Invalid(field.NewPath("series.count"), "", "should be at least 2")) } if event.Series.LastObservedTime.Time == zeroTime { allErrs = append(allErrs, field.Required(field.NewPath("series.lastObservedTime"), "")) diff --git a/pkg/apis/networking/validation/validation.go b/pkg/apis/networking/validation/validation.go index 1b4acf52b51..2091a2cff2e 100644 --- a/pkg/apis/networking/validation/validation.go +++ b/pkg/apis/networking/validation/validation.go @@ -239,8 +239,7 @@ func validateIngress(ingress *networking.Ingress, opts IngressValidationOptions, // ValidateIngressCreate validates Ingresses on create. func ValidateIngressCreate(ingress *networking.Ingress, requestGV schema.GroupVersion) field.ErrorList { allErrs := field.ErrorList{} - var opts IngressValidationOptions - opts = IngressValidationOptions{ + opts := IngressValidationOptions{ AllowInvalidSecretName: allowInvalidSecretName(requestGV, nil), AllowInvalidWildcardHostRule: allowInvalidWildcardHostRule(requestGV, nil), } @@ -256,8 +255,7 @@ func ValidateIngressCreate(ingress *networking.Ingress, requestGV schema.GroupVe // ValidateIngressUpdate validates ingresses on update. func ValidateIngressUpdate(ingress, oldIngress *networking.Ingress, requestGV schema.GroupVersion) field.ErrorList { allErrs := apivalidation.ValidateObjectMetaUpdate(&ingress.ObjectMeta, &oldIngress.ObjectMeta, field.NewPath("metadata")) - var opts IngressValidationOptions - opts = IngressValidationOptions{ + opts := IngressValidationOptions{ AllowInvalidSecretName: allowInvalidSecretName(requestGV, oldIngress), AllowInvalidWildcardHostRule: allowInvalidWildcardHostRule(requestGV, oldIngress), } diff --git a/pkg/apis/policy/validation/validation.go b/pkg/apis/policy/validation/validation.go index a18d850ce6c..94ad2f428de 100644 --- a/pkg/apis/policy/validation/validation.go +++ b/pkg/apis/policy/validation/validation.go @@ -432,7 +432,7 @@ func validatePodSecurityPolicySysctls(fldPath *field.Path, sysctls []string) fie coversAll := false for i, s := range sysctls { if len(s) == 0 { - allErrs = append(allErrs, field.Invalid(fldPath.Index(i), sysctls[i], fmt.Sprintf("empty sysctl not allowed"))) + allErrs = append(allErrs, field.Invalid(fldPath.Index(i), sysctls[i], "empty sysctl not allowed")) } else if !IsValidSysctlPattern(string(s)) { allErrs = append( allErrs, @@ -447,7 +447,7 @@ func validatePodSecurityPolicySysctls(fldPath *field.Path, sysctls []string) fie } if coversAll && len(sysctls) > 1 { - allErrs = append(allErrs, field.Forbidden(fldPath.Child("items"), fmt.Sprintf("if '*' is present, must not specify other sysctls"))) + allErrs = append(allErrs, field.Forbidden(fldPath.Child("items"), "if '*' is present, must not specify other sysctls")) } return allErrs