Skip to content

Commit 991909f

Browse files
author
Eric Ernst
committed
PodOverhead: remove feature gate override in tests
PodOverhead is now a beta feature and set to true by default. No need to override to true during testing. Signed-off-by: Eric Ernst <[email protected]>
1 parent 4637991 commit 991909f

File tree

9 files changed

+0
-47
lines changed

9 files changed

+0
-47
lines changed

‎pkg/api/v1/resource/BUILD‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,9 @@ go_test(
1111
srcs = ["helpers_test.go"],
1212
embed = [":go_default_library"],
1313
deps = [
14-
"//pkg/features:go_default_library",
1514
"//staging/src/k8s.io/api/core/v1:go_default_library",
1615
"//staging/src/k8s.io/apimachinery/pkg/api/equality:go_default_library",
1716
"//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",
18-
"//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
19-
"//staging/src/k8s.io/component-base/featuregate/testing:go_default_library",
2017
"//vendor/github.com/stretchr/testify/assert:go_default_library",
2118
],
2219
)

‎pkg/api/v1/resource/helpers_test.go‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ import (
2424
"k8s.io/api/core/v1"
2525
"k8s.io/apimachinery/pkg/api/equality"
2626
"k8s.io/apimachinery/pkg/api/resource"
27-
utilfeature "k8s.io/apiserver/pkg/util/feature"
28-
featuregatetesting "k8s.io/component-base/featuregate/testing"
29-
"k8s.io/kubernetes/pkg/features"
3027
)
3128

3229
func TestResourceHelpers(t *testing.T) {
@@ -68,8 +65,6 @@ func TestDefaultResourceHelpers(t *testing.T) {
6865
}
6966

7067
func TestGetResourceRequest(t *testing.T) {
71-
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.PodOverhead, true)()
72-
7368
cases := []struct {
7469
pod *v1.Pod
7570
cName string
@@ -273,8 +268,6 @@ func TestExtractResourceValue(t *testing.T) {
273268
}
274269

275270
func TestPodRequestsAndLimits(t *testing.T) {
276-
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.PodOverhead, true)()
277-
278271
cases := []struct {
279272
pod *v1.Pod
280273
cName string

‎pkg/apis/node/validation/BUILD‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,8 @@ go_test(
2222
deps = [
2323
"//pkg/apis/core:go_default_library",
2424
"//pkg/apis/node:go_default_library",
25-
"//pkg/features:go_default_library",
2625
"//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",
2726
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
28-
"//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
29-
"//staging/src/k8s.io/component-base/featuregate/testing:go_default_library",
3027
"//vendor/github.com/stretchr/testify/assert:go_default_library",
3128
"//vendor/k8s.io/utils/pointer:go_default_library",
3229
],

‎pkg/apis/node/validation/validation_test.go‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,8 @@ import (
2121

2222
"k8s.io/apimachinery/pkg/api/resource"
2323
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
24-
utilfeature "k8s.io/apiserver/pkg/util/feature"
25-
featuregatetesting "k8s.io/component-base/featuregate/testing"
2624
"k8s.io/kubernetes/pkg/apis/core"
2725
"k8s.io/kubernetes/pkg/apis/node"
28-
"k8s.io/kubernetes/pkg/features"
2926
utilpointer "k8s.io/utils/pointer"
3027

3128
"github.com/stretchr/testify/assert"
@@ -134,9 +131,6 @@ func TestValidateRuntimeUpdate(t *testing.T) {
134131
}
135132

136133
func TestValidateOverhead(t *testing.T) {
137-
138-
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.PodOverhead, true)()
139-
140134
successCase := []struct {
141135
Name string
142136
overhead *node.Overhead

‎pkg/scheduler/framework/plugins/noderesources/fit_test.go‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@ import (
2525

2626
v1 "k8s.io/api/core/v1"
2727
"k8s.io/apimachinery/pkg/api/resource"
28-
utilfeature "k8s.io/apiserver/pkg/util/feature"
29-
featuregatetesting "k8s.io/component-base/featuregate/testing"
3028
v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
31-
"k8s.io/kubernetes/pkg/features"
3229
framework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
3330
schedulernodeinfo "k8s.io/kubernetes/pkg/scheduler/nodeinfo"
3431
)
@@ -94,8 +91,6 @@ func getErrReason(rn v1.ResourceName) string {
9491
}
9592

9693
func TestEnoughRequests(t *testing.T) {
97-
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.PodOverhead, true)()
98-
9994
enoughPodsTests := []struct {
10095
pod *v1.Pod
10196
nodeInfo *schedulernodeinfo.NodeInfo
@@ -413,7 +408,6 @@ func TestPreFilterDisabled(t *testing.T) {
413408
}
414409

415410
func TestNotEnoughRequests(t *testing.T) {
416-
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.PodOverhead, true)()
417411
notEnoughPodsTests := []struct {
418412
pod *v1.Pod
419413
nodeInfo *schedulernodeinfo.NodeInfo
@@ -468,8 +462,6 @@ func TestNotEnoughRequests(t *testing.T) {
468462
}
469463

470464
func TestStorageRequests(t *testing.T) {
471-
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.PodOverhead, true)()
472-
473465
storagePodsTests := []struct {
474466
pod *v1.Pod
475467
nodeInfo *schedulernodeinfo.NodeInfo

‎pkg/scheduler/nodeinfo/BUILD‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,10 @@ go_test(
2727
],
2828
embed = [":go_default_library"],
2929
deps = [
30-
"//pkg/features:go_default_library",
3130
"//staging/src/k8s.io/api/core/v1:go_default_library",
3231
"//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",
3332
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
3433
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
35-
"//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
36-
"//staging/src/k8s.io/component-base/featuregate/testing:go_default_library",
3734
],
3835
)
3936

‎pkg/scheduler/nodeinfo/node_info_test.go‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ import (
2626
"k8s.io/apimachinery/pkg/api/resource"
2727
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2828
"k8s.io/apimachinery/pkg/types"
29-
utilfeature "k8s.io/apiserver/pkg/util/feature"
30-
featuregatetesting "k8s.io/component-base/featuregate/testing"
31-
"k8s.io/kubernetes/pkg/features"
3229
)
3330

3431
func TestNewResource(t *testing.T) {
@@ -543,9 +540,6 @@ func TestNodeInfoClone(t *testing.T) {
543540
}
544541

545542
func TestNodeInfoAddPod(t *testing.T) {
546-
547-
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.PodOverhead, true)()
548-
549543
nodeName := "test-node"
550544
pods := []*v1.Pod{
551545
{
@@ -720,9 +714,6 @@ func TestNodeInfoAddPod(t *testing.T) {
720714
}
721715

722716
func TestNodeInfoRemovePod(t *testing.T) {
723-
724-
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.PodOverhead, true)()
725-
726717
nodeName := "test-node"
727718
pods := []*v1.Pod{
728719
makeBasePod(t, nodeName, "test-1", "100m", "500", "", []v1.ContainerPort{{HostIP: "127.0.0.1", HostPort: 80, Protocol: "TCP"}}),

‎plugin/pkg/admission/runtimeclass/BUILD‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,13 @@ go_test(
2828
embed = [":go_default_library"],
2929
deps = [
3030
"//pkg/apis/core:go_default_library",
31-
"//pkg/features:go_default_library",
3231
"//staging/src/k8s.io/api/core/v1:go_default_library",
3332
"//staging/src/k8s.io/api/node/v1beta1:go_default_library",
3433
"//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",
3534
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
3635
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
3736
"//staging/src/k8s.io/apiserver/pkg/admission:go_default_library",
3837
"//staging/src/k8s.io/apiserver/pkg/authentication/user:go_default_library",
39-
"//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
40-
"//staging/src/k8s.io/component-base/featuregate/testing:go_default_library",
4138
"//vendor/github.com/stretchr/testify/assert:go_default_library",
4239
],
4340
)

‎plugin/pkg/admission/runtimeclass/admission_test.go‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,7 @@ import (
2929
"k8s.io/apimachinery/pkg/runtime"
3030
"k8s.io/apiserver/pkg/admission"
3131
"k8s.io/apiserver/pkg/authentication/user"
32-
utilfeature "k8s.io/apiserver/pkg/util/feature"
33-
featuregatetesting "k8s.io/component-base/featuregate/testing"
3432
"k8s.io/kubernetes/pkg/apis/core"
35-
"k8s.io/kubernetes/pkg/features"
3633

3734
"github.com/stretchr/testify/assert"
3835
)
@@ -319,8 +316,6 @@ func NewObjectInterfacesForTest() admission.ObjectInterfaces {
319316
}
320317

321318
func TestValidate(t *testing.T) {
322-
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.PodOverhead, true)()
323-
324319
tests := []struct {
325320
name string
326321
runtimeClass *v1beta1.RuntimeClass

0 commit comments

Comments
 (0)