diff --git a/pkg/apis/core/validation/validation.go b/pkg/apis/core/validation/validation.go index 33b1b2572d7..fd41a417871 100644 --- a/pkg/apis/core/validation/validation.go +++ b/pkg/apis/core/validation/validation.go @@ -3225,7 +3225,7 @@ func ValidatePodSpec(spec *core.PodSpec, fldPath *field.Path) field.ErrorList { allErrs = append(allErrs, ValidatePreemptionPolicy(spec.PreemptionPolicy, fldPath.Child("preemptionPolicy"))...) } - if spec.Overhead != nil && utilfeature.DefaultFeatureGate.Enabled(features.PodOverhead) { + if spec.Overhead != nil { allErrs = append(allErrs, validateOverhead(spec.Overhead, fldPath.Child("overhead"))...) } diff --git a/pkg/apis/core/validation/validation_test.go b/pkg/apis/core/validation/validation_test.go index 3bf035b4f21..8be54ccd507 100644 --- a/pkg/apis/core/validation/validation_test.go +++ b/pkg/apis/core/validation/validation_test.go @@ -6565,9 +6565,6 @@ func TestValidatePodSpec(t *testing.T) { minGroupID := int64(0) maxGroupID := int64(2147483647) - defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.RuntimeClass, true)() - defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.PodOverhead, true)() - successCases := []core.PodSpec{ { // Populate basic fields, leave defaults for most. Volumes: []core.Volume{{Name: "vol", VolumeSource: core.VolumeSource{EmptyDir: &core.EmptyDirVolumeSource{}}}}, @@ -14344,8 +14341,6 @@ func TestValidateTopologySpreadConstraints(t *testing.T) { } func TestValidateOverhead(t *testing.T) { - defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.PodOverhead, true)() - successCase := []struct { Name string overhead core.ResourceList diff --git a/pkg/apis/node/validation/BUILD b/pkg/apis/node/validation/BUILD index 233cda296f5..5439a0eb0fb 100644 --- a/pkg/apis/node/validation/BUILD +++ b/pkg/apis/node/validation/BUILD @@ -9,10 +9,8 @@ go_library( "//pkg/apis/core:go_default_library", "//pkg/apis/core/validation:go_default_library", "//pkg/apis/node:go_default_library", - "//pkg/features:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/validation:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/validation/field:go_default_library", - "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", ], ) diff --git a/pkg/apis/node/validation/validation.go b/pkg/apis/node/validation/validation.go index d329bd7fe80..64131ae9dbd 100644 --- a/pkg/apis/node/validation/validation.go +++ b/pkg/apis/node/validation/validation.go @@ -19,11 +19,9 @@ package validation import ( apivalidation "k8s.io/apimachinery/pkg/api/validation" "k8s.io/apimachinery/pkg/util/validation/field" - utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/kubernetes/pkg/apis/core" corevalidation "k8s.io/kubernetes/pkg/apis/core/validation" "k8s.io/kubernetes/pkg/apis/node" - "k8s.io/kubernetes/pkg/features" ) // ValidateRuntimeClass validates the RuntimeClass @@ -34,7 +32,7 @@ func ValidateRuntimeClass(rc *node.RuntimeClass) field.ErrorList { allErrs = append(allErrs, field.Invalid(field.NewPath("handler"), rc.Handler, msg)) } - if rc.Overhead != nil && utilfeature.DefaultFeatureGate.Enabled(features.PodOverhead) { + if rc.Overhead != nil { allErrs = append(allErrs, validateOverhead(rc.Overhead, field.NewPath("overhead"))...) }