diff --git a/test/e2e/apimachinery/namespace.go b/test/e2e/apimachinery/namespace.go index 7c3910af1f0..4080302f170 100644 --- a/test/e2e/apimachinery/namespace.go +++ b/test/e2e/apimachinery/namespace.go @@ -20,11 +20,12 @@ import ( "context" "encoding/json" "fmt" - "k8s.io/kubernetes/pkg/features" "strings" "sync" "time" + "k8s.io/kubernetes/pkg/features" + v1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -481,7 +482,7 @@ var _ = SIGDescribe("OrderedNamespaceDeletion", func() { f := framework.NewDefaultFramework("namespacedeletion") f.NamespacePodSecurityLevel = admissionapi.LevelBaseline - f.It("namespace deletion should delete pod first", feature.OrderedNamespaceDeletion, framework.WithFeatureGate(features.OrderedNamespaceDeletion), func(ctx context.Context) { + f.It("namespace deletion should delete pod first", framework.WithFeatureGate(features.OrderedNamespaceDeletion), framework.WithSerial(), func(ctx context.Context) { ensurePodsAreRemovedFirstInOrderedNamespaceDeletion(ctx, f) }) }) diff --git a/test/e2e/feature/feature.go b/test/e2e/feature/feature.go index 86caa4e5cee..08851b5946a 100644 --- a/test/e2e/feature/feature.go +++ b/test/e2e/feature/feature.go @@ -313,10 +313,6 @@ var ( // Tests aiming to verify oom_score functionality OOMScoreAdj = framework.WithFeature(framework.ValidFeatures.Add("OOMScoreAdj")) - // Owner: sig-api-machinery - // Marks tests that enforce ordered namespace deletion. - OrderedNamespaceDeletion = framework.WithFeature(framework.ValidFeatures.Add("OrderedNamespaceDeletion")) - // Owner: sig-node // Verify ProcMount feature. // Used in combination with user namespaces