Skip to content

Commit 2670462

Browse files
committed
Remove TopologyHints and TrafficDistribution feature flags
The features are always enabled, so the tests don't need to be conditional.
1 parent b4c6895 commit 2670462

File tree

3 files changed

+2
-13
lines changed

3 files changed

+2
-13
lines changed

test/e2e/feature/feature.go

-8
Original file line numberDiff line numberDiff line change
@@ -512,14 +512,6 @@ var (
512512
// - ci-kubernetes-node-e2e-cri-proxy-serial
513513
CriProxy = framework.WithFeature(framework.ValidFeatures.Add("CriProxy"))
514514

515-
// Owner: sig-network
516-
// Marks tests that require a cluster with Topology Hints enabled.
517-
TopologyHints = framework.WithFeature(framework.ValidFeatures.Add("Topology Hints"))
518-
519-
// Owner: sig-network
520-
// Marks tests that require a cluster with Traffic Distribution enabled.
521-
TrafficDistribution = framework.WithFeature(framework.ValidFeatures.Add("Traffic Distribution"))
522-
523515
// TODO: document the feature (owning SIG, when to use this feature for a test)
524516
TopologyManager = framework.WithFeature(framework.ValidFeatures.Add("TopologyManager"))
525517

test/e2e/network/topology_hints.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import (
3030
"k8s.io/apimachinery/pkg/util/intstr"
3131
"k8s.io/apimachinery/pkg/util/wait"
3232
clientset "k8s.io/client-go/kubernetes"
33-
"k8s.io/kubernetes/test/e2e/feature"
3433
"k8s.io/kubernetes/test/e2e/framework"
3534
e2edaemonset "k8s.io/kubernetes/test/e2e/framework/daemonset"
3635
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
@@ -41,7 +40,7 @@ import (
4140
admissionapi "k8s.io/pod-security-admission/api"
4241
)
4342

44-
var _ = common.SIGDescribe(feature.TopologyHints, func() {
43+
var _ = common.SIGDescribe("Topology Hints", func() {
4544
f := framework.NewDefaultFramework("topology-hints")
4645
f.NamespacePodSecurityLevel = admissionapi.LevelPrivileged
4746

test/e2e/network/traffic_distribution.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ import (
2828
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2929
"k8s.io/apimachinery/pkg/util/intstr"
3030
clientset "k8s.io/client-go/kubernetes"
31-
"k8s.io/kubernetes/pkg/features"
32-
"k8s.io/kubernetes/test/e2e/feature"
3331
"k8s.io/kubernetes/test/e2e/framework"
3432
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
3533
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
@@ -43,7 +41,7 @@ import (
4341
"github.com/onsi/gomega"
4442
)
4543

46-
var _ = common.SIGDescribe(feature.TrafficDistribution, framework.WithFeatureGate(features.ServiceTrafficDistribution), func() {
44+
var _ = common.SIGDescribe("Traffic Distribution", func() {
4745
f := framework.NewDefaultFramework("traffic-distribution")
4846
f.NamespacePodSecurityLevel = admissionapi.LevelPrivileged
4947

0 commit comments

Comments
 (0)