Skip to content

Commit 6873e81

Browse files
committed
Run in-place resize tests in default CI jobs
1 parent e3baee3 commit 6873e81

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

test/e2e/common/node/pod_resize.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"k8s.io/apimachinery/pkg/api/resource"
2727
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2828
"k8s.io/apimachinery/pkg/types"
29-
"k8s.io/kubernetes/test/e2e/feature"
29+
"k8s.io/kubernetes/pkg/features"
3030
"k8s.io/kubernetes/test/e2e/framework"
3131
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
3232
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
@@ -1440,7 +1440,7 @@ func doPodResizeErrorTests() {
14401440
// Above tests are performed by doSheduletTests() and doPodResizeResourceQuotaTests()
14411441
// in test/e2e/node/pod_resize.go
14421442

1443-
var _ = SIGDescribe("Pod InPlace Resize Container", feature.InPlacePodVerticalScaling, func() {
1443+
var _ = SIGDescribe("Pod InPlace Resize Container", framework.WithFeatureGate(features.InPlacePodVerticalScaling), func() {
14441444
f := framework.NewDefaultFramework("pod-resize-tests")
14451445

14461446
ginkgo.BeforeEach(func(ctx context.Context) {

test/e2e/feature/feature.go

-3
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,6 @@ var (
231231
// Ingress.networking.k8s.io to be present.
232232
Ingress = framework.WithFeature(framework.ValidFeatures.Add("Ingress"))
233233

234-
// TODO: document the feature (owning SIG, when to use this feature for a test)
235-
InPlacePodVerticalScaling = framework.WithFeature(framework.ValidFeatures.Add("InPlacePodVerticalScaling"))
236-
237234
// Owner: sig-network
238235
// Marks tests that require a cluster with dual-stack pod and service networks.
239236
IPv6DualStack = framework.WithFeature(framework.ValidFeatures.Add("IPv6DualStack"))

test/e2e/node/pod_resize.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"k8s.io/apimachinery/pkg/types"
2929
helpers "k8s.io/component-helpers/resource"
3030
resourceapi "k8s.io/kubernetes/pkg/api/v1/resource"
31-
"k8s.io/kubernetes/test/e2e/feature"
31+
"k8s.io/kubernetes/pkg/features"
3232
"k8s.io/kubernetes/test/e2e/framework"
3333
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
3434
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
@@ -417,7 +417,7 @@ func doPodResizeSchedulerTests(f *framework.Framework) {
417417
})
418418
}
419419

420-
var _ = SIGDescribe(framework.WithSerial(), "Pod InPlace Resize Container (scheduler-focused)", feature.InPlacePodVerticalScaling, func() {
420+
var _ = SIGDescribe(framework.WithSerial(), "Pod InPlace Resize Container (scheduler-focused)", framework.WithFeatureGate(features.InPlacePodVerticalScaling), func() {
421421
f := framework.NewDefaultFramework("pod-resize-scheduler-tests")
422422
ginkgo.BeforeEach(func(ctx context.Context) {
423423
node, err := e2enode.GetRandomReadySchedulableNode(ctx, f.ClientSet)
@@ -429,7 +429,7 @@ var _ = SIGDescribe(framework.WithSerial(), "Pod InPlace Resize Container (sched
429429
doPodResizeSchedulerTests(f)
430430
})
431431

432-
var _ = SIGDescribe("Pod InPlace Resize Container", feature.InPlacePodVerticalScaling, func() {
432+
var _ = SIGDescribe("Pod InPlace Resize Container", framework.WithFeatureGate(features.InPlacePodVerticalScaling), func() {
433433
f := framework.NewDefaultFramework("pod-resize-tests")
434434

435435
ginkgo.BeforeEach(func(ctx context.Context) {

0 commit comments

Comments
 (0)