From 2670462eb037db70cbbb6fc6100547d6a9557172 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Thu, 20 Mar 2025 14:57:05 -0400 Subject: [PATCH] Remove TopologyHints and TrafficDistribution feature flags The features are always enabled, so the tests don't need to be conditional. --- test/e2e/feature/feature.go | 8 -------- test/e2e/network/topology_hints.go | 3 +-- test/e2e/network/traffic_distribution.go | 4 +--- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/test/e2e/feature/feature.go b/test/e2e/feature/feature.go index 684d6f401ef..077f73e6db2 100644 --- a/test/e2e/feature/feature.go +++ b/test/e2e/feature/feature.go @@ -512,14 +512,6 @@ var ( // - ci-kubernetes-node-e2e-cri-proxy-serial CriProxy = framework.WithFeature(framework.ValidFeatures.Add("CriProxy")) - // Owner: sig-network - // Marks tests that require a cluster with Topology Hints enabled. - TopologyHints = framework.WithFeature(framework.ValidFeatures.Add("Topology Hints")) - - // Owner: sig-network - // Marks tests that require a cluster with Traffic Distribution enabled. - TrafficDistribution = framework.WithFeature(framework.ValidFeatures.Add("Traffic Distribution")) - // TODO: document the feature (owning SIG, when to use this feature for a test) TopologyManager = framework.WithFeature(framework.ValidFeatures.Add("TopologyManager")) diff --git a/test/e2e/network/topology_hints.go b/test/e2e/network/topology_hints.go index 5b553e46af9..c9b63683c5c 100644 --- a/test/e2e/network/topology_hints.go +++ b/test/e2e/network/topology_hints.go @@ -30,7 +30,6 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/wait" clientset "k8s.io/client-go/kubernetes" - "k8s.io/kubernetes/test/e2e/feature" "k8s.io/kubernetes/test/e2e/framework" e2edaemonset "k8s.io/kubernetes/test/e2e/framework/daemonset" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" @@ -41,7 +40,7 @@ import ( admissionapi "k8s.io/pod-security-admission/api" ) -var _ = common.SIGDescribe(feature.TopologyHints, func() { +var _ = common.SIGDescribe("Topology Hints", func() { f := framework.NewDefaultFramework("topology-hints") f.NamespacePodSecurityLevel = admissionapi.LevelPrivileged diff --git a/test/e2e/network/traffic_distribution.go b/test/e2e/network/traffic_distribution.go index 34591075d67..8db13f8da2b 100644 --- a/test/e2e/network/traffic_distribution.go +++ b/test/e2e/network/traffic_distribution.go @@ -28,8 +28,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" clientset "k8s.io/client-go/kubernetes" - "k8s.io/kubernetes/pkg/features" - "k8s.io/kubernetes/test/e2e/feature" "k8s.io/kubernetes/test/e2e/framework" e2enode "k8s.io/kubernetes/test/e2e/framework/node" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" @@ -43,7 +41,7 @@ import ( "github.com/onsi/gomega" ) -var _ = common.SIGDescribe(feature.TrafficDistribution, framework.WithFeatureGate(features.ServiceTrafficDistribution), func() { +var _ = common.SIGDescribe("Traffic Distribution", func() { f := framework.NewDefaultFramework("traffic-distribution") f.NamespacePodSecurityLevel = admissionapi.LevelPrivileged