From 7c53a5aaa4d27d19fbb88e5fd8d69ddc00251108 Mon Sep 17 00:00:00 2001 From: carlory Date: Fri, 17 Jan 2025 15:59:51 +0800 Subject: [PATCH] Remove feature label NodeOutOfServiceVolumeDetach --- test/e2e/feature/feature.go | 3 --- test/e2e/storage/non_graceful_node_shutdown.go | 4 +--- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/test/e2e/feature/feature.go b/test/e2e/feature/feature.go index 5087e691db6..a24a21a746d 100644 --- a/test/e2e/feature/feature.go +++ b/test/e2e/feature/feature.go @@ -347,9 +347,6 @@ var ( // TODO: document the feature (owning SIG, when to use this feature for a test) NodeLogQuery = framework.WithFeature(framework.ValidFeatures.Add("NodeLogQuery")) - // TODO: document the feature (owning SIG, when to use this feature for a test) - NodeOutOfServiceVolumeDetach = framework.WithFeature(framework.ValidFeatures.Add("NodeOutOfServiceVolumeDetach")) - // Owner: sig-node // Tests aiming to verify oom_score functionality OOMScoreAdj = framework.WithFeature(framework.ValidFeatures.Add("OOMScoreAdj")) diff --git a/test/e2e/storage/non_graceful_node_shutdown.go b/test/e2e/storage/non_graceful_node_shutdown.go index 960123239b6..aebc009d730 100644 --- a/test/e2e/storage/non_graceful_node_shutdown.go +++ b/test/e2e/storage/non_graceful_node_shutdown.go @@ -27,7 +27,6 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" clientset "k8s.io/client-go/kubernetes" - "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 +42,6 @@ import ( /* This test assumes the following: - The infra is GCP. -- NodeOutOfServiceVolumeDetach feature is enabled. This test performs the following: - Deploys a gce-pd csi driver @@ -58,7 +56,7 @@ This test performs the following: - Removes the `out-of-service` taint from the node. */ -var _ = utils.SIGDescribe(feature.NodeOutOfServiceVolumeDetach, framework.WithDisruptive(), "[LinuxOnly] NonGracefulNodeShutdown", func() { +var _ = utils.SIGDescribe(framework.WithDisruptive(), "[LinuxOnly] NonGracefulNodeShutdown", func() { var ( c clientset.Interface ns string