From 0837e81c7f0e7c8c6ad2365e7a351df9052d94af Mon Sep 17 00:00:00 2001 From: Elvin Efendi Date: Fri, 20 Apr 2018 23:41:21 -0400 Subject: [PATCH] cleanup redundant code --- test/e2e/lua/dynamic_configuration.go | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/test/e2e/lua/dynamic_configuration.go b/test/e2e/lua/dynamic_configuration.go index 9aba6e6b9..038365389 100644 --- a/test/e2e/lua/dynamic_configuration.go +++ b/test/e2e/lua/dynamic_configuration.go @@ -29,7 +29,6 @@ import ( appsv1beta1 "k8s.io/api/apps/v1beta1" extensions "k8s.io/api/extensions/v1beta1" - v1beta1 "k8s.io/api/extensions/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/client-go/kubernetes" @@ -74,9 +73,6 @@ var _ = framework.IngressNginxDescribe("Dynamic Configuration", func() { Expect(log).To(ContainSubstring("first sync of Nginx configuration")) }) - AfterEach(func() { - }) - Context("when only backends change", func() { It("should handle endpoints only changes", func() { resp, _, errs := gorequest.New(). @@ -146,7 +142,7 @@ var _ = framework.IngressNginxDescribe("Dynamic Configuration", func() { ingress, err := f.KubeClientSet.ExtensionsV1beta1().Ingresses(f.IngressController.Namespace).Get("foo.com", metav1.GetOptions{}) Expect(err).ToNot(HaveOccurred()) - ingress.Spec.TLS = []v1beta1.IngressTLS{ + ingress.Spec.TLS = []extensions.IngressTLS{ { Hosts: []string{"foo.com"}, SecretName: "foo.com", @@ -187,7 +183,6 @@ var _ = framework.IngressNginxDescribe("Dynamic Configuration", func() { }) Expect(err).NotTo(HaveOccurred()) }) - Context("when session affinity annotation is present", func() { It("should use sticky sessions when ingress rules are configured", func() { cookieName := "STICKYSESSION" @@ -256,8 +251,8 @@ var _ = framework.IngressNginxDescribe("Dynamic Configuration", func() { By("Updating affinity annotation and rules on ingress") ingress, err := f.KubeClientSet.ExtensionsV1beta1().Ingresses(f.IngressController.Namespace).Get("foo.com", metav1.GetOptions{}) Expect(err).ToNot(HaveOccurred()) - ingress.Spec = v1beta1.IngressSpec{ - Backend: &v1beta1.IngressBackend{ + ingress.Spec = extensions.IngressSpec{ + Backend: &extensions.IngressBackend{ ServiceName: "http-svc", ServicePort: intstr.FromInt(80), },