diff --git a/test/e2e/autoscaling/dns_autoscaling.go b/test/e2e/autoscaling/dns_autoscaling.go index ff9963167ec..2e1333cb378 100644 --- a/test/e2e/autoscaling/dns_autoscaling.go +++ b/test/e2e/autoscaling/dns_autoscaling.go @@ -29,7 +29,6 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/util/wait" 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" @@ -106,7 +105,7 @@ var _ = SIGDescribe("DNS horizontal autoscaling", func() { // This test is separated because it is slow and need to run serially. // Will take around 5 minutes to run on a 4 nodes cluster. // TODO(upodroid) This test will be removed in 1.33 when kubeup is removed - f.It(f.WithSerial(), f.WithSlow(), feature.KubeUp, "kube-dns-autoscaler should scale kube-dns pods when cluster size changed", func(ctx context.Context) { + f.It(f.WithSerial(), f.WithSlow(), f.WithLabel("KubeUp"), "kube-dns-autoscaler should scale kube-dns pods when cluster size changed", func(ctx context.Context) { numNodes, err := e2enode.TotalRegistered(ctx, c) framework.ExpectNoError(err) diff --git a/test/e2e/cloud/gcp/restart.go b/test/e2e/cloud/gcp/restart.go index ed23660e2f2..5a3679c49a6 100644 --- a/test/e2e/cloud/gcp/restart.go +++ b/test/e2e/cloud/gcp/restart.go @@ -88,7 +88,8 @@ var _ = SIGDescribe("Restart", framework.WithDisruptive(), func() { } }) - ginkgo.It("should restart all nodes and ensure all nodes and pods recover", func(ctx context.Context) { + // TODO(upodroid) This test will be removed in 1.33 when kubeup is removed + f.It(f.WithLabel("KubeUp"), "should restart all nodes and ensure all nodes and pods recover", func(ctx context.Context) { ginkgo.By("restarting all of the nodes") err := common.RestartNodes(f.ClientSet, originalNodes) framework.ExpectNoError(err) diff --git a/test/e2e/feature/feature.go b/test/e2e/feature/feature.go index 2d1914c5c82..4071cd0279e 100644 --- a/test/e2e/feature/feature.go +++ b/test/e2e/feature/feature.go @@ -71,7 +71,6 @@ var ( KubeProxyDaemonSetDowngrade = framework.WithFeature(framework.ValidFeatures.Add("KubeProxyDaemonSetDowngrade")) KubeProxyDaemonSetUpgrade = framework.WithFeature(framework.ValidFeatures.Add("KubeProxyDaemonSetUpgrade")) KubeProxyDaemonSetMigration = framework.WithFeature(framework.ValidFeatures.Add("KubeProxyDaemonSetMigration")) - KubeUp = framework.WithFeature(framework.ValidFeatures.Add("KubeUp")) LabelSelector = framework.WithFeature(framework.ValidFeatures.Add("LabelSelector")) LocalStorageCapacityIsolation = framework.WithFeature(framework.ValidFeatures.Add("LocalStorageCapacityIsolation")) LocalStorageCapacityIsolationQuota = framework.WithFeature(framework.ValidFeatures.Add("LocalStorageCapacityIsolationQuota"))