From 36c0dab4fccd0ee2fb698120e5f28eda5ac40250 Mon Sep 17 00:00:00 2001 From: Janet Kuo Date: Fri, 21 Sep 2018 15:11:40 -0700 Subject: [PATCH] Enable TTLAfterFinished e2e test --- test/e2e/common/BUILD | 2 -- test/e2e/common/ttlafterfinished.go | 9 +++------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/test/e2e/common/BUILD b/test/e2e/common/BUILD index 74f14a9bd3f..d4e0218ec0e 100644 --- a/test/e2e/common/BUILD +++ b/test/e2e/common/BUILD @@ -44,7 +44,6 @@ go_library( "//pkg/apis/core:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/conditions:go_default_library", - "//pkg/features:go_default_library", "//pkg/kubelet:go_default_library", "//pkg/kubelet/apis:go_default_library", "//pkg/kubelet/images:go_default_library", @@ -69,7 +68,6 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library", - "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//staging/src/k8s.io/client-go/scale:go_default_library", "//staging/src/k8s.io/client-go/tools/cache:go_default_library", diff --git a/test/e2e/common/ttlafterfinished.go b/test/e2e/common/ttlafterfinished.go index 1c62997bd23..24c4694e982 100644 --- a/test/e2e/common/ttlafterfinished.go +++ b/test/e2e/common/ttlafterfinished.go @@ -17,13 +17,12 @@ limitations under the License. package common import ( + "fmt" "time" batch "k8s.io/api/batch/v1" "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/wait" - utilfeature "k8s.io/apiserver/pkg/util/feature" - "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/util/slice" "k8s.io/kubernetes/test/e2e/framework" @@ -36,10 +35,8 @@ const dummyFinalizer = "k8s.io/dummy-finalizer" var _ = framework.KubeDescribe("TTLAfterFinished", func() { f := framework.NewDefaultFramework("ttlafterfinished") - It("Job should be deleted once it finishes after TTL seconds [Feature:TTLAfterFinished]", func() { - if !utilfeature.DefaultFeatureGate.Enabled(features.TTLAfterFinished) { - framework.Skipf("Skip because %s feature is not enabled; run test with --feature-gates=%s=true", features.TTLAfterFinished, features.TTLAfterFinished) - } + alphaFeatureStr := "[Feature:TTLAfterFinished]" + It(fmt.Sprintf("Job should be deleted once it finishes after TTL seconds %s", alphaFeatureStr), func() { testFinishedJob(f) }) })