From d4958c0beec34a36af28d019358f686785bb459b Mon Sep 17 00:00:00 2001 From: Joe Betz Date: Tue, 20 Aug 2019 14:30:01 -0700 Subject: [PATCH] Remove all skips from admission and CRD e2e tests that will be promoted to conformance --- test/e2e/apimachinery/crd_conversion_webhook.go | 6 ------ test/e2e/apimachinery/crd_publish_openapi.go | 8 +------- test/e2e/apimachinery/crd_watch.go | 2 -- test/e2e/apimachinery/custom_resource_definition.go | 3 --- test/e2e/apimachinery/webhook.go | 12 ------------ 5 files changed, 1 insertion(+), 30 deletions(-) diff --git a/test/e2e/apimachinery/crd_conversion_webhook.go b/test/e2e/apimachinery/crd_conversion_webhook.go index 551cb095c61..3af639c12d3 100644 --- a/test/e2e/apimachinery/crd_conversion_webhook.go +++ b/test/e2e/apimachinery/crd_conversion_webhook.go @@ -30,7 +30,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/util/intstr" - utilversion "k8s.io/apimachinery/pkg/util/version" "k8s.io/client-go/dynamic" clientset "k8s.io/client-go/kubernetes" "k8s.io/kubernetes/test/e2e/framework" @@ -54,8 +53,6 @@ const ( roleBindingCRDName = "crd-conversion-webhook-auth-reader" ) -var serverCRDConversionWebhookVersion = utilversion.MustParseSemantic("v1.13.0-alpha") - var apiVersions = []apiextensionsv1.CustomResourceDefinitionVersion{ { Name: "v1", @@ -129,9 +126,6 @@ var _ = SIGDescribe("CustomResourceConversionWebhook", func() { client = f.ClientSet namespaceName = f.Namespace.Name - // Make sure the relevant provider supports conversion webhook - framework.SkipUnlessServerVersionGTE(serverCRDConversionWebhookVersion, f.ClientSet.Discovery()) - ginkgo.By("Setting up server cert") context = setupServerCert(f.Namespace.Name, serviceCRDName) createAuthReaderRoleBindingForCRDConversion(f, f.Namespace.Name) diff --git a/test/e2e/apimachinery/crd_publish_openapi.go b/test/e2e/apimachinery/crd_publish_openapi.go index b285679db54..6dce7a38d59 100644 --- a/test/e2e/apimachinery/crd_publish_openapi.go +++ b/test/e2e/apimachinery/crd_publish_openapi.go @@ -35,7 +35,6 @@ import ( apiequality "k8s.io/apimachinery/pkg/api/equality" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - utilversion "k8s.io/apimachinery/pkg/util/version" "k8s.io/apimachinery/pkg/util/wait" k8sclientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" @@ -47,17 +46,12 @@ import ( ) var ( - crdPublishOpenAPIVersion = utilversion.MustParseSemantic("v1.14.0") - metaPattern = `"kind":"%s","apiVersion":"%s/%s","metadata":{"name":"%s"}` + metaPattern = `"kind":"%s","apiVersion":"%s/%s","metadata":{"name":"%s"}` ) var _ = SIGDescribe("CustomResourcePublishOpenAPI", func() { f := framework.NewDefaultFramework("crd-publish-openapi") - ginkgo.BeforeEach(func() { - framework.SkipUnlessServerVersionGTE(crdPublishOpenAPIVersion, f.ClientSet.Discovery()) - }) - ginkgo.It("works for CRD with validation schema", func() { crd, err := setupCRD(f, schemaFoo, "foo", "v1") if err != nil { diff --git a/test/e2e/apimachinery/crd_watch.go b/test/e2e/apimachinery/crd_watch.go index 5162dd82553..be08b2a00b1 100644 --- a/test/e2e/apimachinery/crd_watch.go +++ b/test/e2e/apimachinery/crd_watch.go @@ -46,8 +46,6 @@ var _ = SIGDescribe("CustomResourceDefinition Watch", func() { */ ginkgo.It("watch on custom resource definition objects", func() { - framework.SkipUnlessServerVersionGTE(crdVersion, f.ClientSet.Discovery()) - const ( watchCRNameA = "name1" watchCRNameB = "name2" diff --git a/test/e2e/apimachinery/custom_resource_definition.go b/test/e2e/apimachinery/custom_resource_definition.go index 70f23c3d02e..f5b7344d623 100644 --- a/test/e2e/apimachinery/custom_resource_definition.go +++ b/test/e2e/apimachinery/custom_resource_definition.go @@ -29,15 +29,12 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/diff" "k8s.io/apimachinery/pkg/util/uuid" - utilversion "k8s.io/apimachinery/pkg/util/version" "k8s.io/client-go/dynamic" "k8s.io/client-go/util/retry" "k8s.io/kubernetes/test/e2e/framework" e2elog "k8s.io/kubernetes/test/e2e/framework/log" ) -var crdVersion = utilversion.MustParseSemantic("v1.7.0") - var _ = SIGDescribe("CustomResourceDefinition resources", func() { f := framework.NewDefaultFramework("custom-resource-definition") diff --git a/test/e2e/apimachinery/webhook.go b/test/e2e/apimachinery/webhook.go index a6a43d745ef..2ee7f9afc54 100644 --- a/test/e2e/apimachinery/webhook.go +++ b/test/e2e/apimachinery/webhook.go @@ -36,7 +36,6 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/uuid" - utilversion "k8s.io/apimachinery/pkg/util/version" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/dynamic" clientset "k8s.io/client-go/kubernetes" @@ -77,8 +76,6 @@ const ( addedLabelValue = "yes" ) -var serverWebhookVersion = utilversion.MustParseSemantic("v1.8.0") - var _ = SIGDescribe("AdmissionWebhook", func() { var context *certContext f := framework.NewDefaultFramework("webhook") @@ -92,15 +89,6 @@ var _ = SIGDescribe("AdmissionWebhook", func() { client = f.ClientSet namespaceName = f.Namespace.Name - // Make sure the relevant provider supports admission webhook - framework.SkipUnlessServerVersionGTE(serverWebhookVersion, f.ClientSet.Discovery()) - framework.SkipUnlessProviderIs("gce", "gke", "local") - - _, err := f.ClientSet.AdmissionregistrationV1().ValidatingWebhookConfigurations().List(metav1.ListOptions{}) - if errors.IsNotFound(err) { - framework.Skipf("dynamic configuration of webhooks requires the admissionregistration.k8s.io group to be enabled") - } - // Make sure the namespace created for the test is labeled to be selected by the webhooks labelNamespace(f, f.Namespace.Name)