From 2b911dda651663b23a312d648aa44da335efaa4a Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Thu, 6 Jun 2019 10:08:47 -0400 Subject: [PATCH] Fix conflicting duplicate webhook test --- test/e2e/apimachinery/webhook.go | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/test/e2e/apimachinery/webhook.go b/test/e2e/apimachinery/webhook.go index 00e7731f891..7cbc6e71736 100644 --- a/test/e2e/apimachinery/webhook.go +++ b/test/e2e/apimachinery/webhook.go @@ -64,7 +64,6 @@ const ( attachingPodWebhookConfigName = "e2e-test-webhook-config-attaching-pod" mutatingWebhookConfigName = "e2e-test-mutating-webhook-config" podMutatingWebhookConfigName = "e2e-test-mutating-webhook-pod" - crMutatingWebhookConfigName = "e2e-test-mutating-webhook-config-cr" webhookFailClosedConfigName = "e2e-test-webhook-fail-closed" validatingWebhookForWebhooksConfigName = "e2e-test-validating-webhook-for-webhooks-config" mutatingWebhookForWebhooksConfigName = "e2e-test-mutating-webhook-for-webhooks-config" @@ -233,13 +232,6 @@ var _ = SIGDescribe("AdmissionWebhook", func() { testMutatingCustomResourceWebhook(f, testcrd.Crd, testcrd.DynamicClients["v1"], prune) }) - ginkgo.It("Should deny crd creation", func() { - crdWebhookCleanup := registerValidatingWebhookForCRD(f, context) - defer crdWebhookCleanup() - - testCRDDenyWebhook(f) - }) - ginkgo.It("Should honor timeout", func() { policyFail := v1beta1.Fail policyIgnore := v1beta1.Ignore @@ -1340,10 +1332,10 @@ func registerWebhookForCustomResource(f *framework.Framework, context *certConte func registerMutatingWebhookForCustomResource(f *framework.Framework, context *certContext, testcrd *crd.TestCrd) func() { client := f.ClientSet - ginkgo.By("Registering the mutating webhook for a custom resource via the AdmissionRegistration API") + ginkgo.By(fmt.Sprintf("Registering the mutating webhook for custom resource %s via the AdmissionRegistration API", testcrd.Crd.Name)) namespace := f.Namespace.Name - configName := crMutatingWebhookConfigName + configName := f.UniqueName _, err := client.AdmissionregistrationV1beta1().MutatingWebhookConfigurations().Create(&v1beta1.MutatingWebhookConfiguration{ ObjectMeta: metav1.ObjectMeta{ Name: configName,