From ce31686686fbe43ac1dbb1304f16947f53c7a1cf Mon Sep 17 00:00:00 2001
From: Jordan Liggitt <liggitt@google.com>
Date: Tue, 5 Mar 2019 14:55:45 -0500
Subject: [PATCH] Scope slow/failing webhook to test namespace

---
 test/e2e/apimachinery/webhook.go | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/test/e2e/apimachinery/webhook.go b/test/e2e/apimachinery/webhook.go
index 09b5d2c1652..73d0fd0d111 100644
--- a/test/e2e/apimachinery/webhook.go
+++ b/test/e2e/apimachinery/webhook.go
@@ -1481,7 +1481,17 @@ func registerSlowWebhook(f *framework.Framework, context *certContext, policy *v
 	namespace := f.Namespace.Name
 	configName := slowWebhookConfigName
 
-	_, err := client.AdmissionregistrationV1beta1().ValidatingWebhookConfigurations().Create(&v1beta1.ValidatingWebhookConfiguration{
+	// Add a unique label to the namespace
+	ns, err := client.CoreV1().Namespaces().Get(namespace, metav1.GetOptions{})
+	framework.ExpectNoError(err, "error getting namespace %s", namespace)
+	if ns.Labels == nil {
+		ns.Labels = map[string]string{}
+	}
+	ns.Labels[slowWebhookConfigName] = namespace
+	_, err = client.CoreV1().Namespaces().Update(ns)
+	framework.ExpectNoError(err, "error labeling namespace %s", namespace)
+
+	_, err = client.AdmissionregistrationV1beta1().ValidatingWebhookConfigurations().Create(&v1beta1.ValidatingWebhookConfiguration{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: configName,
 		},
@@ -1504,6 +1514,10 @@ func registerSlowWebhook(f *framework.Framework, context *certContext, policy *v
 					},
 					CABundle: context.signingCert,
 				},
+				// Scope the webhook to just this namespace
+				NamespaceSelector: &metav1.LabelSelector{
+					MatchLabels: ns.Labels,
+				},
 				FailurePolicy:  policy,
 				TimeoutSeconds: timeout,
 			},