Remove hard-coded names from e2e test and use local docker dependencies (#4502)

test/e2e/gracefulshutdown/shutdown.go

@@ -0,0 +1,186 @@
+/*
+Copyright 2019 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package gracefulshutdown
+
+import (
+	"net/http"
+	"time"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+	"github.com/parnurzeal/gorequest"
+	appsv1 "k8s.io/api/apps/v1"
+
+	"k8s.io/ingress-nginx/test/e2e/framework"
+)
+
+var _ = framework.IngressNginxDescribe("Shutdown ingress controller", func() {
+	f := framework.NewDefaultFramework("shutdown-ingress-controller")
+
+	host := "shutdown"
+
+	BeforeEach(func() {
+		f.UpdateNginxConfigMapData("worker-shutdown-timeout", "600s")
+
+		f.NewSlowEchoDeployment()
+	})
+
+	AfterEach(func() {
+	})
+
+	It("should shutdown in less than 60 secons without pending connections", func() {
+		f.EnsureIngress(framework.NewSingleIngress(host, "/", host, f.Namespace, framework.SlowEchoService, 80, nil))
+
+		f.WaitForNginxServer(host,
+			func(server string) bool {
+				return Expect(server).Should(ContainSubstring("server_name shutdown"))
+			})
+
+		resp, _, _ := gorequest.New().
+			Get(f.GetURL(framework.HTTP)+"/sleep/1").
+			Set("Host", host).
+			End()
+		Expect(resp.StatusCode).Should(Equal(http.StatusOK))
+
+		startTime := time.Now()
+
+		f.ScaleDeploymentToZero("nginx-ingress-controller")
+
+		Expect(time.Since(startTime).Seconds()).To(BeNumerically("<=", 60), "waiting shutdown")
+	})
+
+	type asyncResult struct {
+		errs   []error
+		status int
+	}
+
+	It("should shutdown after waiting 60 seconds for pending connections to be closed", func() {
+		framework.UpdateDeployment(f.KubeClientSet, f.Namespace, "nginx-ingress-controller", 1,
+			func(deployment *appsv1.Deployment) error {
+				grace := int64(3600)
+				deployment.Spec.Template.Spec.TerminationGracePeriodSeconds = &grace
+				_, err := f.KubeClientSet.AppsV1().Deployments(f.Namespace).Update(deployment)
+				return err
+			})
+
+		annotations := map[string]string{
+			"nginx.ingress.kubernetes.io/proxy-send-timeout": "600",
+			"nginx.ingress.kubernetes.io/proxy-read-timeout": "600",
+		}
+		f.EnsureIngress(framework.NewSingleIngress(host, "/", host, f.Namespace, framework.SlowEchoService, 80, &annotations))
+
+		f.WaitForNginxServer(host,
+			func(server string) bool {
+				return Expect(server).Should(ContainSubstring("server_name shutdown"))
+			})
+
+		result := make(chan *asyncResult)
+
+		startTime := time.Now()
+
+		go func(host string, c chan *asyncResult) {
+			resp, _, errs := gorequest.New().
+				Get(f.GetURL(framework.HTTP)+"/sleep/70").
+				Set("Host", host).
+				End()
+
+			code := 0
+			if resp != nil {
+				code = resp.StatusCode
+			}
+
+			c <- &asyncResult{errs, code}
+		}(host, result)
+
+		time.Sleep(5 * time.Second)
+
+		f.ScaleDeploymentToZero("nginx-ingress-controller")
+
+		ticker := time.NewTicker(time.Second * 10)
+
+		for {
+			select {
+			case res := <-result:
+				Expect(res.errs).Should(BeEmpty())
+				Expect(res.status).To(Equal(http.StatusOK), "expecting a valid response from HTTP request")
+				Expect(time.Since(startTime).Seconds()).To(BeNumerically(">", 70), "waiting shutdown")
+				ticker.Stop()
+				return
+			case <-ticker.C:
+				framework.Logf("waiting for request completion after shutdown")
+			}
+		}
+	})
+
+	It("should shutdown after waiting 150 seconds for pending connections to be closed", func() {
+		framework.UpdateDeployment(f.KubeClientSet, f.Namespace, "nginx-ingress-controller", 1,
+			func(deployment *appsv1.Deployment) error {
+				grace := int64(3600)
+				deployment.Spec.Template.Spec.TerminationGracePeriodSeconds = &grace
+				_, err := f.KubeClientSet.AppsV1().Deployments(f.Namespace).Update(deployment)
+				return err
+			})
+
+		annotations := map[string]string{
+			"nginx.ingress.kubernetes.io/proxy-send-timeout": "600",
+			"nginx.ingress.kubernetes.io/proxy-read-timeout": "600",
+		}
+		f.EnsureIngress(framework.NewSingleIngress(host, "/", host, f.Namespace, framework.SlowEchoService, 80, &annotations))
+
+		f.WaitForNginxServer(host,
+			func(server string) bool {
+				return Expect(server).Should(ContainSubstring("server_name shutdown"))
+			})
+
+		result := make(chan *asyncResult)
+
+		startTime := time.Now()
+
+		go func(host string, c chan *asyncResult) {
+			resp, _, errs := gorequest.New().
+				Get(f.GetURL(framework.HTTP)+"/sleep/150").
+				Set("Host", host).
+				End()
+
+			code := 0
+			if resp != nil {
+				code = resp.StatusCode
+			}
+
+			c <- &asyncResult{errs, code}
+		}(host, result)
+
+		time.Sleep(5 * time.Second)
+
+		f.ScaleDeploymentToZero("nginx-ingress-controller")
+
+		ticker := time.NewTicker(time.Second * 10)
+
+		for {
+			select {
+			case res := <-result:
+				Expect(res.errs).Should(BeEmpty())
+				Expect(res.status).To(Equal(http.StatusOK), "expecting a valid response from HTTP request")
+				Expect(time.Since(startTime).Seconds()).To(BeNumerically(">", 150), "waiting shutdown")
+				ticker.Stop()
+				return
+			case <-ticker.C:
+				framework.Logf("waiting for request completion after shutdown")
+			}
+		}
+	})
+})

test/e2e/gracefulshutdown/slow_requests.go

@@ -38,7 +38,7 @@ var _ = framework.IngressNginxDescribe("Graceful Shutdown - Slow Requests", func
 	It("should let slow requests finish before shutting down", func() {
 		host := "graceful-shutdown"
 
-		f.EnsureIngress(framework.NewSingleIngress(host, "/", host, f.Namespace, "slowecho", 8080, nil))
+		f.EnsureIngress(framework.NewSingleIngress(host, "/", host, f.Namespace, framework.SlowEchoService, 80, nil))
 		f.WaitForNginxConfiguration(
 			func(conf string) bool {
 				return strings.Contains(conf, "worker_shutdown_timeout")