From 12990dec4057847bf6e7e8037c27baa16e58648b Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Mon, 25 Apr 2022 14:41:30 +0200 Subject: [PATCH] e2e: remove useless SkipUnlessFeatureGateEnabled These SkipUnlessFeatureGateEnabled are useless because: - the tests run in test/e2e where feature gates always have their default state - CSIMigration, SizeMemoryBackedVolumes and ExecProbeTimeout are all enabled by default (beta resp. GA) --- test/e2e/common/node/container_probe.go | 14 -------------- test/e2e/common/storage/empty_dir.go | 4 ---- test/e2e/storage/volume_limits.go | 5 +---- 3 files changed, 1 insertion(+), 22 deletions(-) diff --git a/test/e2e/common/node/container_probe.go b/test/e2e/common/node/container_probe.go index dfb49ce32af..1c1fae5a589 100644 --- a/test/e2e/common/node/container_probe.go +++ b/test/e2e/common/node/container_probe.go @@ -29,12 +29,10 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/uuid" podutil "k8s.io/kubernetes/pkg/api/v1/pod" - kubefeatures "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/kubelet/events" "k8s.io/kubernetes/test/e2e/framework" e2eevents "k8s.io/kubernetes/test/e2e/framework/events" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" - e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" testutils "k8s.io/kubernetes/test/utils" imageutils "k8s.io/kubernetes/test/utils/image" admissionapi "k8s.io/pod-security-admission/api" @@ -220,9 +218,6 @@ var _ = SIGDescribe("Probing container", func() { Description: A Pod is created with liveness probe with a Exec action on the Pod. If the liveness probe call does not return within the timeout specified, liveness probe MUST restart the Pod. */ ginkgo.It("should be restarted with an exec liveness probe with timeout [MinimumKubeletVersion:1.20] [NodeConformance]", func() { - // The ExecProbeTimeout feature gate exists to allow backwards-compatibility with pre-1.20 cluster behaviors, where livenessProbe timeouts were ignored - // If ExecProbeTimeout feature gate is disabled, timeout enforcement for exec livenessProbes is disabled, so we should skip this test - e2eskipper.SkipUnlessFeatureGateEnabled(kubefeatures.ExecProbeTimeout) cmd := []string{"/bin/sh", "-c", "sleep 600"} livenessProbe := &v1.Probe{ ProbeHandler: execHandler([]string{"/bin/sh", "-c", "sleep 10"}), @@ -240,10 +235,6 @@ var _ = SIGDescribe("Probing container", func() { Description: A Pod is created with readiness probe with a Exec action on the Pod. If the readiness probe call does not return within the timeout specified, readiness probe MUST not be Ready. */ ginkgo.It("should not be ready with an exec readiness probe timeout [MinimumKubeletVersion:1.20] [NodeConformance]", func() { - // The ExecProbeTimeout feature gate exists to allow backwards-compatibility with pre-1.20 cluster behaviors, where readiness probe timeouts were ignored - // If ExecProbeTimeout feature gate is disabled, timeout enforcement for exec readiness probe is disabled, so we should skip this test - e2eskipper.SkipUnlessFeatureGateEnabled(kubefeatures.ExecProbeTimeout) - cmd := []string{"/bin/sh", "-c", "sleep 600"} readinessProbe := &v1.Probe{ ProbeHandler: execHandler([]string{"/bin/sh", "-c", "sleep 10"}), @@ -261,11 +252,6 @@ var _ = SIGDescribe("Probing container", func() { Description: A Pod is created with liveness probe with a Exec action on the Pod. If the liveness probe call does not return within the timeout specified, liveness probe MUST restart the Pod. When ExecProbeTimeout feature gate is disabled and cluster is using dockershim, the timeout is ignored BUT a failing liveness probe MUST restart the Pod. */ ginkgo.It("should be restarted with a failing exec liveness probe that took longer than the timeout", func() { - // The ExecProbeTimeout feature gate exists to allow backwards-compatibility with pre-1.20 cluster behaviors using dockershim, where livenessProbe timeouts were ignored - // If ExecProbeTimeout feature gate is disabled on a dockershim cluster, timeout enforcement for exec livenessProbes is disabled, but a failing liveness probe MUST still trigger a restart - // Note ExecProbeTimeout=false is not recommended for non-dockershim clusters (e.g., containerd), and this test will fail if run against such a configuration - e2eskipper.SkipUnlessFeatureGateEnabled(kubefeatures.ExecProbeTimeout) - cmd := []string{"/bin/sh", "-c", "sleep 600"} livenessProbe := &v1.Probe{ ProbeHandler: execHandler([]string{"/bin/sh", "-c", "sleep 10 & exit 1"}), diff --git a/test/e2e/common/storage/empty_dir.go b/test/e2e/common/storage/empty_dir.go index e0cdcea2406..5d90524398c 100644 --- a/test/e2e/common/storage/empty_dir.go +++ b/test/e2e/common/storage/empty_dir.go @@ -26,7 +26,6 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/uuid" - "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/test/e2e/framework" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" @@ -297,9 +296,6 @@ var _ = SIGDescribe("EmptyDir volumes", func() { Description: A Pod created with an 'emptyDir' Volume backed by memory should be sized to user provided value. */ ginkgo.It("pod should support memory backed volumes of specified size", func() { - // skip if feature gate is not enabled, this could be elevated to conformance in future if on Linux. - e2eskipper.SkipUnlessFeatureGateEnabled(features.SizeMemoryBackedVolumes) - var ( volumeName = "shared-data" busyBoxMainVolumeMountPath = "/usr/share/volumeshare" diff --git a/test/e2e/storage/volume_limits.go b/test/e2e/storage/volume_limits.go index 8d87c2c182b..4614507d56e 100644 --- a/test/e2e/storage/volume_limits.go +++ b/test/e2e/storage/volume_limits.go @@ -18,10 +18,9 @@ package storage import ( "github.com/onsi/ginkgo" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" clientset "k8s.io/client-go/kubernetes" v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" - kubefeatures "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/test/e2e/framework" e2enode "k8s.io/kubernetes/test/e2e/framework/node" e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" @@ -37,8 +36,6 @@ var _ = utils.SIGDescribe("Volume limits", func() { f.NamespacePodSecurityEnforceLevel = admissionapi.LevelPrivileged ginkgo.BeforeEach(func() { e2eskipper.SkipUnlessProviderIs("aws", "gce", "gke") - // If CSIMigration is enabled, then the limits should be on CSINodes, not Nodes, and another test checks this - e2eskipper.SkipIfFeatureGateEnabled(kubefeatures.CSIMigration) c = f.ClientSet framework.ExpectNoError(framework.WaitForAllNodesSchedulable(c, framework.TestContext.NodeSchedulableTimeout)) })