Simplified test suite

Author: btoll

test/e2e/managed_cluster_validating_webhooks_test.go

@@ -123,7 +123,7 @@ var _ = Describe("Managed Cluster Validating Webhooks", Ordered, func() {
 		Expect(err).ToNot(HaveOccurred())
 	})
 
-	It("should create a pod with the correct security context", func() {
+	It("should create a pod with the correct security context", func(ctx context.Context) {
 		pod := &v1.Pod{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      "testpod",
@@ -149,29 +149,25 @@ var _ = Describe("Managed Cluster Validating Webhooks", Ordered, func() {
 			},
 		}
 
-		err := client.Create(context.TODO(), pod)
+		err := client.Create(ctx, pod)
 		Expect(err).NotTo(HaveOccurred())
 		err = client.Delete(ctx, pod)
 		Expect(err).NotTo(HaveOccurred())
 	})
 
 	Describe("sre-pod-validation", Ordered, func() {
 		const (
-			privilegedNamespace   = "openshift-backplane"
-			unprivilegedNamespace = "openshift-logging"
-
 			deletePodWaitDuration = 5 * time.Minute
 			createPodWaitDuration = 1 * time.Minute
 		)
 
 		var pod *v1.Pod
 
 		BeforeAll(func() {
-			name := envconf.RandomName("testpod", 12)
 			pod = &v1.Pod{
 				ObjectMeta: metav1.ObjectMeta{
-					Name:      name,
-					Namespace: testNsName,
+					Name:      envconf.RandomName("testpod", 12),
+					Namespace: privilegedNamespace,
 				},
 				Spec: v1.PodSpec{
 					Containers: []v1.Container{
@@ -220,20 +216,17 @@ var _ = Describe("Managed Cluster Validating Webhooks", Ordered, func() {
 			}
 		})
 
-		withNamespace := func(pod *v1.Pod, namespace string) *v1.Pod {
-			pod.SetNamespace(namespace)
-			return pod
-		}
-
 		It("blocks pods scheduled onto master/infra nodes", func(ctx context.Context) {
-			err := dedicatedAdmink8s.Create(ctx, withNamespace(pod, privilegedNamespace))
+			err := dedicatedAdmink8s.Create(ctx, pod)
 			Expect(errors.IsForbidden(err)).To(BeTrue())
 
-			err = userk8s.Create(ctx, withNamespace(pod, privilegedNamespace))
+			err = userk8s.Create(ctx, pod)
 			Expect(errors.IsForbidden(err)).To(BeTrue())
 
-			err = userk8s.Create(ctx, withNamespace(pod, unprivilegedNamespace))
+			pod.SetNamespace(unprivilegedNamespace)
+			err = userk8s.Create(ctx, pod)
 			Expect(errors.IsForbidden(err)).To(BeTrue())
+			pod.SetNamespace(privilegedNamespace)
 		}, SpecTimeout(createPodWaitDuration.Seconds()+deletePodWaitDuration.Seconds()))
 
 		It("allows cluster-admin to schedule pods onto master/infra nodes", func(ctx context.Context) {
@@ -248,7 +241,6 @@ var _ = Describe("Managed Cluster Validating Webhooks", Ordered, func() {
 			err = client.Delete(ctx, sa)
 			Expect(err).ShouldNot(HaveOccurred(), "Unable to delete service account")
 
-			pod = withNamespace(pod, privilegedNamespace)
 			err = client.Create(ctx, pod)
 			Expect(err).NotTo(HaveOccurred())
 			err = client.Delete(ctx, pod)
@@ -599,9 +591,6 @@ var _ = Describe("Managed Cluster Validating Webhooks", Ordered, func() {
 	})
 
 	Describe("sre-prometheusrule-validation", func() {
-		const privilegedNamespace = "openshift-backplane"
-		const unprivilegedNamespace = "openshift-logging"
-
 		newPrometheusRule := func(namespace string) *monitoringv1.PrometheusRule {
 			return &monitoringv1.PrometheusRule{
 				ObjectMeta: metav1.ObjectMeta{Name: "prometheus-example-app", Namespace: namespace},
@@ -665,7 +654,7 @@ var _ = Describe("Managed Cluster Validating Webhooks", Ordered, func() {
 		})
 
 		It("allows non-privileged users to manage PrometheusRules in non-privileged namespaces", func(ctx context.Context) {
-			rule := newPrometheusRule("osde2e-temp-ns")
+			rule := newPrometheusRule(testNsName)
 
 			err := dedicatedAdmink8s.Create(ctx, rule)
 			Expect(err).NotTo(HaveOccurred())