Cleanup and standardization of e2e test definitions (#5090)

test/e2e/annotations/affinity.go

@@ -33,7 +33,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Annotations - Affinity/Sticky Sessions", func() {
+var _ = framework.DescribeAnnotation("affinity session-cookie-name", func() {
 	f := framework.NewDefaultFramework("affinity")
 
 	BeforeEach(func() {

test/e2e/annotations/alias.go

@@ -27,7 +27,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Annotations - Alias", func() {
+var _ = framework.DescribeAnnotation("server-alias", func() {
 	f := framework.NewDefaultFramework("alias")
 
 	BeforeEach(func() {

test/e2e/annotations/approot.go

@@ -26,7 +26,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Annotations - Approot", func() {
+var _ = framework.DescribeAnnotation("app-root", func() {
 	f := framework.NewDefaultFramework("approot")
 
 	BeforeEach(func() {

test/e2e/annotations/auth.go

@@ -33,7 +33,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Annotations - Auth", func() {
+var _ = framework.DescribeAnnotation("auth-*", func() {
 	f := framework.NewDefaultFramework("auth")
 
 	BeforeEach(func() {

test/e2e/annotations/authtls.go

@@ -28,7 +28,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Annotations - AuthTLS", func() {
+var _ = framework.DescribeAnnotation("auth-tls-*", func() {
 	f := framework.NewDefaultFramework("authtls")
 
 	BeforeEach(func() {

test/e2e/annotations/backendprotocol.go

@@ -22,7 +22,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Annotations - Backendprotocol", func() {
+var _ = framework.DescribeAnnotation("backend-protocol", func() {
 	f := framework.NewDefaultFramework("backendprotocol")
 
 	BeforeEach(func() {

test/e2e/annotations/canary.go

@@ -31,7 +31,7 @@ const (
 	canaryService = "echo-canary"
 )
 
-var _ = framework.IngressNginxDescribe("Annotations - canary", func() {
+var _ = framework.DescribeAnnotation("canary-*", func() {
 	f := framework.NewDefaultFramework("canary")
 
 	BeforeEach(func() {

test/e2e/annotations/clientbodybuffersize.go

@@ -22,7 +22,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Annotations - Client-Body-Buffer-Size", func() {
+var _ = framework.DescribeAnnotation("client-body-buffer-size", func() {
 	f := framework.NewDefaultFramework("clientbodybuffersize")
 
 	BeforeEach(func() {

test/e2e/annotations/connection.go

@@ -27,7 +27,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Annotations - Connection", func() {
+var _ = framework.DescribeAnnotation("connection-proxy-header", func() {
 	f := framework.NewDefaultFramework("connection")
 
 	BeforeEach(func() {

test/e2e/annotations/cors.go

@@ -26,7 +26,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Annotations - CORS", func() {
+var _ = framework.DescribeAnnotation("cors-*", func() {
 	f := framework.NewDefaultFramework("cors")
 
 	BeforeEach(func() {

test/e2e/annotations/customhttperrors.go

@@ -31,7 +31,7 @@ func errorBlockName(upstreamName string, errorCode string) string {
 	return fmt.Sprintf("@custom_%s_%s", upstreamName, errorCode)
 }
 
-var _ = framework.IngressNginxDescribe("Annotations - custom-http-errors", func() {
+var _ = framework.DescribeAnnotation("custom-http-errors", func() {
 	f := framework.NewDefaultFramework("custom-http-errors")
 
 	BeforeEach(func() {

test/e2e/annotations/default_backend.go

@@ -27,7 +27,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Annotations - custom default-backend", func() {
+var _ = framework.DescribeAnnotation("default-backend", func() {
 	f := framework.NewDefaultFramework("default-backend")
 
 	BeforeEach(func() {

test/e2e/annotations/fastcgi.go

@@ -28,7 +28,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Annotations - FastCGI", func() {
+var _ = framework.DescribeAnnotation("backend-protocol - FastCGI", func() {
 	f := framework.NewDefaultFramework("fastcgi")
 
 	BeforeEach(func() {

test/e2e/annotations/forcesslredirect.go

@@ -26,7 +26,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Annotations - Forcesslredirect", func() {
+var _ = framework.DescribeAnnotation("force-ssl-redirect", func() {
 	f := framework.NewDefaultFramework("forcesslredirect")
 
 	BeforeEach(func() {

test/e2e/annotations/fromtowwwredirect.go

@@ -29,7 +29,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Annotations - from-to-www-redirect", func() {
+var _ = framework.DescribeAnnotation("from-to-www-redirect", func() {
 	f := framework.NewDefaultFramework("fromtowwwredirect")
 
 	BeforeEach(func() {

test/e2e/annotations/grpc.go

@@ -36,7 +36,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Annotations - GRPC", func() {
+var _ = framework.DescribeAnnotation("backend-protocol - GRPC", func() {
 	f := framework.NewDefaultFramework("grpc")
 
 	It("should use grpc_pass in the configuration file", func() {

test/e2e/annotations/http2pushpreload.go

@@ -22,7 +22,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Annotations - HTTP2 Push Preload", func() {
+var _ = framework.DescribeAnnotation("http2-push-preload", func() {
 	f := framework.NewDefaultFramework("http2pushpreload")
 
 	BeforeEach(func() {

test/e2e/annotations/influxdb.go

@@ -36,7 +36,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Annotations - influxdb", func() {
+var _ = framework.DescribeAnnotation("influxdb-*", func() {
 	f := framework.NewDefaultFramework("influxdb")
 
 	BeforeEach(func() {

test/e2e/annotations/ipwhitelist.go

@@ -24,7 +24,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Annotations - IPWhiteList", func() {
+var _ = framework.DescribeAnnotation("whitelist-source-range", func() {
 	f := framework.NewDefaultFramework("ipwhitelist")
 
 	BeforeEach(func() {

test/e2e/annotations/log.go

@@ -23,7 +23,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Annotations - Log", func() {
+var _ = framework.DescribeAnnotation("enable-access-log enable-rewrite-log", func() {
 	f := framework.NewDefaultFramework("log")
 
 	BeforeEach(func() {

test/e2e/annotations/mirror.go

@@ -25,7 +25,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Annotations - Mirror", func() {
+var _ = framework.DescribeAnnotation("mirror-*", func() {
 	f := framework.NewDefaultFramework("mirror")
 	host := "mirror.foo.com"
 

test/e2e/annotations/modsecurity.go

@@ -23,7 +23,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Annotations - ModSecurityLocation", func() {
+var _ = framework.DescribeAnnotation("modsecurity owasp", func() {
 	f := framework.NewDefaultFramework("modsecuritylocation")
 
 	BeforeEach(func() {

test/e2e/annotations/proxy.go

@@ -25,7 +25,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Annotations - Proxy", func() {
+var _ = framework.DescribeAnnotation("proxy-*", func() {
 	f := framework.NewDefaultFramework("proxy")
 	host := "proxy.foo.com"
 

test/e2e/annotations/proxyssl.go

@@ -25,7 +25,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Annotations - ProxySSL", func() {
+var _ = framework.DescribeAnnotation("proxy-ssl-*", func() {
 	f := framework.NewDefaultFramework("proxyssl")
 
 	BeforeEach(func() {

test/e2e/annotations/redirect.go

@@ -34,7 +34,7 @@ func noRedirectPolicyFunc(gorequest.Request, []gorequest.Request) error {
 	return http.ErrUseLastResponse
 }
 
-var _ = framework.IngressNginxDescribe("Annotations - Redirect", func() {
+var _ = framework.DescribeAnnotation("permanen-redirect permanen-redirect-code", func() {
 	f := framework.NewDefaultFramework("redirect")
 
 	It("should respond with a standard redirect code", func() {

test/e2e/annotations/rewrite.go

@@ -29,7 +29,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Annotations - Rewrite", func() {
+var _ = framework.DescribeAnnotation("rewrite-target use-regex enable-rewrite-log", func() {
 	f := framework.NewDefaultFramework("rewrite")
 
 	BeforeEach(func() {

test/e2e/annotations/satisfy.go

@@ -30,7 +30,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Annotations - SATISFY", func() {
+var _ = framework.DescribeAnnotation("satisfy", func() {
 	f := framework.NewDefaultFramework("satisfy")
 
 	BeforeEach(func() {

test/e2e/annotations/serversnippet.go

@@ -24,7 +24,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Annotations - ServerSnippet", func() {
+var _ = framework.DescribeAnnotation("server-snippet", func() {
 	f := framework.NewDefaultFramework("serversnippet")
 
 	BeforeEach(func() {

test/e2e/annotations/snippet.go

@@ -22,7 +22,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Annotations - Configurationsnippet", func() {
+var _ = framework.DescribeAnnotation("configuration-snippet", func() {
 	f := framework.NewDefaultFramework("configurationsnippet")
 
 	BeforeEach(func() {

test/e2e/annotations/sslciphers.go

@@ -23,7 +23,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Annotations - SSL CIPHERS", func() {
+var _ = framework.DescribeAnnotation("ssl-ciphers", func() {
 	f := framework.NewDefaultFramework("sslciphers")
 
 	BeforeEach(func() {

test/e2e/annotations/upstreamhashby.go

@@ -72,7 +72,7 @@ func startIngress(f *framework.Framework, annotations map[string]string) map[str
 	return podMap
 }
 
-var _ = framework.IngressNginxDescribe("Annotations - UpstreamHashBy", func() {
+var _ = framework.DescribeAnnotation("upstream-hash-by-*", func() {
 	f := framework.NewDefaultFramework("upstream-hash-by")
 
 	BeforeEach(func() {

test/e2e/annotations/upstreamvhost.go

@@ -22,7 +22,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Annotations - Upstreamvhost", func() {
+var _ = framework.DescribeAnnotation("upstream-vhost", func() {
 	f := framework.NewDefaultFramework("upstreamvhost")
 
 	BeforeEach(func() {

test/e2e/annotations/xforwardedprefix.go

@@ -25,7 +25,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Annotations - X-Forwarded-Prefix", func() {
+var _ = framework.DescribeAnnotation("x-forwarded-prefix", func() {
 	f := framework.NewDefaultFramework("xforwardedprefix")
 
 	BeforeEach(func() {

test/e2e/dbg/main.go

@@ -26,7 +26,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Debug Tool", func() {
+var _ = framework.IngressNginxDescribe("Debug CLI", func() {
 	f := framework.NewDefaultFramework("debug-tool")
 	host := "foo.com"
 

test/e2e/defaultbackend/custom_default_backend.go

@@ -32,7 +32,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Custom Default Backend", func() {
+var _ = framework.IngressNginxDescribe("[Default Backend] custom service", func() {
 	f := framework.NewDefaultFramework("custom-default-backend")
 
 	BeforeEach(func() {

test/e2e/defaultbackend/default_backend.go

@@ -27,7 +27,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Default backend", func() {
+var _ = framework.IngressNginxDescribe("[Default Backend]", func() {
 	f := framework.NewDefaultFramework("default-backend")
 
 	It("should return 404 sending requests when only a default backend is running", func() {

test/e2e/defaultbackend/ssl.go

@@ -26,7 +26,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Default backend - SSL", func() {
+var _ = framework.IngressNginxDescribe("[Default Backend] SSL", func() {
 	f := framework.NewDefaultFramework("default-backend")
 
 	It("should return a self generated SSL certificate", func() {

test/e2e/defaultbackend/with_hosts.go

@@ -30,7 +30,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Default backend with hosts", func() {
+var _ = framework.IngressNginxDescribe("[Default Backend] change default settings", func() {
 	f := framework.NewDefaultFramework("default-backend-hosts")
 	host := "foo.com"
 

test/e2e/framework/framework.go

@@ -148,6 +148,16 @@ func IngressNginxDescribe(text string, body func()) bool {
 	return ginkgo.Describe(text, body)
 }
 
+// DescribeAnnotation wrapper function for ginkgo describe. Adds namespacing.
+func DescribeAnnotation(text string, body func()) bool {
+	return ginkgo.Describe("[Annotations] "+text, body)
+}
+
+// DescribeSetting wrapper function for ginkgo describe. Adds namespacing.
+func DescribeSetting(text string, body func()) bool {
+	return ginkgo.Describe("[Setting] "+text, body)
+}
+
 // MemoryLeakIt is wrapper function for ginkgo It.  Adds "[MemoryLeak]" tag and makes static analysis easier.
 func MemoryLeakIt(text string, body interface{}, timeout ...float64) bool {
 	return ginkgo.It(text+" [MemoryLeak]", body, timeout...)

test/e2e/gracefulshutdown/shutdown.go

@@ -28,7 +28,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Shutdown ingress controller", func() {
+var _ = framework.IngressNginxDescribe("[Shutdown] ingress controller", func() {
 	f := framework.NewDefaultFramework("shutdown-ingress-controller")
 
 	host := "shutdown"

test/e2e/gracefulshutdown/slow_requests.go

@@ -27,7 +27,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Graceful Shutdown - Slow Requests", func() {
+var _ = framework.IngressNginxDescribe("[Shutdown] Graceful shutdown with pending request", func() {
 	f := framework.NewDefaultFramework("shutdown-slow-requests")
 
 	BeforeEach(func() {

test/e2e/leaks/lua_ssl.go

@@ -33,7 +33,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("DynamicCertificates", func() {
+var _ = framework.IngressNginxDescribe("[Memory Leak] Dynamic Certificates", func() {
 	f := framework.NewDefaultFramework("lua-dynamic-certificates")
 
 	BeforeEach(func() {

test/e2e/loadbalance/configmap.go

@@ -25,7 +25,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Load Balance - Configmap value", func() {
+var _ = framework.DescribeSetting("[Load Balancer] load-balance", func() {
 	f := framework.NewDefaultFramework("lb-configmap")
 
 	BeforeEach(func() {

test/e2e/loadbalance/ewma.go

@@ -29,13 +29,15 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Load Balance - EWMA", func() {
+var _ = framework.DescribeSetting("[Load Balancer] EWMA", func() {
 	f := framework.NewDefaultFramework("ewma")
 
 	BeforeEach(func() {
 		f.NewEchoDeploymentWithReplicas(3)
-		f.UpdateNginxConfigMapData("worker-processes", "2")
+		f.SetNginxConfigMapData(map[string]string{
-		f.UpdateNginxConfigMapData("load-balance", "ewma")
+			"worker-processes": "2",
+			"load-balance":     "ewma"},
+		)
 	})
 
 	It("does not fail requests", func() {

test/e2e/loadbalance/round_robin.go

@@ -29,7 +29,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Load Balance - Round Robin", func() {
+var _ = framework.DescribeSetting("[Load Balancer] round-robin", func() {
 	f := framework.NewDefaultFramework("round-robin")
 
 	BeforeEach(func() {
@@ -37,10 +37,6 @@ var _ = framework.IngressNginxDescribe("Load Balance - Round Robin", func() {
 		f.UpdateNginxConfigMapData("worker-processes", "1")
 	})
 
-	AfterEach(func() {
-		f.UpdateNginxConfigMapData("worker-processes", "")
-	})
-
 	It("should evenly distribute requests with round-robin (default algorithm)", func() {
 		host := "load-balance.com"
 

test/e2e/lua/dynamic_certificates.go

@@ -33,7 +33,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Dynamic Certificate", func() {
+var _ = framework.IngressNginxDescribe("[Lua] dynamic certificates", func() {
 	f := framework.NewDefaultFramework("dynamic-certificate")
 	host := "foo.com"
 

test/e2e/lua/dynamic_configuration.go

@@ -43,7 +43,7 @@ const (
 	waitForLuaSync          = 5 * time.Second
 )
 
-var _ = framework.IngressNginxDescribe("Dynamic Configuration", func() {
+var _ = framework.IngressNginxDescribe("[Lua] dynamic configuration", func() {
 	f := framework.NewDefaultFramework("dynamic-configuration")
 
 	BeforeEach(func() {

test/e2e/security/request_smuggling.go

@@ -29,7 +29,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Request smuggling", func() {
+var _ = framework.IngressNginxDescribe("[Security] request smuggling", func() {
 	f := framework.NewDefaultFramework("request-smuggling")
 
 	BeforeEach(func() {

test/e2e/servicebackend/service_backend.go

@@ -32,7 +32,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Service backend - 503", func() {
+var _ = framework.IngressNginxDescribe("[Service] backend status code 503", func() {
 	f := framework.NewDefaultFramework("service-backend")
 
 	It("should return 503 when backend service does not exist", func() {

test/e2e/servicebackend/service_externalname.go

@@ -32,7 +32,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Service Type ExternalName", func() {
+var _ = framework.IngressNginxDescribe("[Service] Type ExternalName", func() {
 	f := framework.NewDefaultFramework("type-externalname")
 
 	It("works with external name set to incomplete fdqn", func() {

test/e2e/settings/configmap_change.go

@@ -26,7 +26,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Configmap change", func() {
+var _ = framework.DescribeSetting("Configmap change", func() {
 	f := framework.NewDefaultFramework("configmap-change")
 
 	BeforeEach(func() {
@@ -39,12 +39,9 @@ var _ = framework.IngressNginxDescribe("Configmap change", func() {
 		ing := framework.NewSingleIngress(host, "/", host, f.Namespace, framework.EchoService, 80, nil)
 		f.EnsureIngress(ing)
 
-		wlKey := "whitelist-source-range"
-		wlValue := "1.1.1.1"
-
 		By("adding a whitelist-source-range")
 
-		f.UpdateNginxConfigMapData(wlKey, wlValue)
+		f.UpdateNginxConfigMapData("whitelist-source-range", "1.1.1.1")
 
 		checksumRegex := regexp.MustCompile(`Configuration checksum:\s+(\d+)`)
 		checksum := ""

test/e2e/settings/custom_header.go

@@ -28,7 +28,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Add custom header", func() {
+var _ = framework.DescribeSetting("Add custom headers", func() {
 	f := framework.NewDefaultFramework("custom-header")
 	host := "custom-header"
 

test/e2e/settings/customize_health_check_path.go

@@ -1,46 +0,0 @@
-/*
-Copyright 2017 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 settings
-
-import (
-	"strings"
-
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/ingress-nginx/test/e2e/framework"
-)
-
-var _ = framework.IngressNginxDescribe("Customize health check path", func() {
-	f := framework.NewDefaultFramework("custom-health-check-path")
-
-	Context("with a plain HTTP ingress", func() {
-		It("should return HTTP/1.1 200 OK on custom health port", func() {
-
-			f.WaitForNginxConfiguration(func(server string) bool {
-				return strings.Contains(server, "location /healthz")
-			})
-
-			err := framework.WaitForPodsReady(f.KubeClientSet, framework.DefaultTimeout, 1, f.Namespace, metav1.ListOptions{
-				LabelSelector: "app.kubernetes.io/name=ingress-nginx",
-			})
-
-			Expect(err).NotTo(HaveOccurred())
-		})
-	})
-})

test/e2e/settings/default_ssl_certificate.go

@@ -29,7 +29,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("default-ssl-certificate", func() {
+var _ = framework.IngressNginxDescribe("[SSL] [Flag] default-ssl-certificate", func() {
 	f := framework.NewDefaultFramework("default-ssl-certificate")
 	var tlsConfig *tls.Config
 	secretName := "my-custom-cert"

test/e2e/settings/disable_catch_all.go

@@ -31,7 +31,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Disabled catch-all", func() {
+var _ = framework.IngressNginxDescribe("[Flag] disable-catch-all", func() {
 	f := framework.NewDefaultFramework("disabled-catch-all")
 
 	BeforeEach(func() {

test/e2e/settings/forwarded_headers.go

@@ -28,7 +28,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("X-Forwarded headers", func() {
+var _ = framework.DescribeSetting("use-forwarded-headers", func() {
 	f := framework.NewDefaultFramework("forwarded-headers")
 
 	setting := "use-forwarded-headers"

test/e2e/settings/geoip2.go

@@ -27,7 +27,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Geoip2", func() {
+var _ = framework.DescribeSetting("Geoip2", func() {
 	f := framework.NewDefaultFramework("geoip2")
 
 	host := "geoip2"

test/e2e/settings/global_access_block.go

@@ -27,7 +27,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Global access block", func() {
+var _ = framework.DescribeSetting("[Security] block-*", func() {
 	f := framework.NewDefaultFramework("global-access-block")
 
 	host := "global-access-block"
@@ -47,8 +47,6 @@ var _ = framework.IngressNginxDescribe("Global access block", func() {
 					strings.Contains(cfg, "deny 10.0.0.0/8;")
 			})
 
-		// This test works for minikube, but may have problems with real kubernetes clusters,
-		// especially if connection is done via Internet. In this case, the test should be disabled/removed.
 		resp, _, errs := gorequest.New().
 			Get(f.GetURL(framework.HTTP)).
 			Set("Host", host).

test/e2e/settings/global_external_auth.go

@@ -28,7 +28,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Global External Auth", func() {
+var _ = framework.DescribeSetting("[Security] global-auth-url", func() {
 	f := framework.NewDefaultFramework("global-external-auth")
 
 	host := "global-external-auth"

test/e2e/settings/ingress_class.go

@@ -30,7 +30,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Ingress class", func() {
+var _ = framework.IngressNginxDescribe("[Flag] ingress-class", func() {
 	f := framework.NewDefaultFramework("ingress-class")
 
 	BeforeEach(func() {

test/e2e/settings/listen_nondefault_ports.go

@@ -30,7 +30,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Listen on nondefault ports", func() {
+var _ = framework.IngressNginxDescribe("[Flag] custom HTTP and HTTPS ports", func() {
 
 	host := "forwarded-headers"
 

test/e2e/settings/lua_shared_dicts.go

@@ -23,7 +23,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("LuaSharedDict", func() {
+var _ = framework.DescribeSetting("[Lua] lua-shared-dicts", func() {
 	f := framework.NewDefaultFramework("lua-shared-dicts")
 	host := "lua-shared-dicts"
 

test/e2e/settings/main_snippet.go

@@ -24,7 +24,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Main Snippet", func() {
+var _ = framework.DescribeSetting("main-snippet", func() {
 	f := framework.NewDefaultFramework("main-snippet")
 	mainSnippet := "main-snippet"
 

test/e2e/settings/modsecurity_snippet.go

@@ -24,7 +24,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Modsecurity Snippet", func() {
+var _ = framework.DescribeSetting("[Security] modsecurity-snippet", func() {
 	f := framework.NewDefaultFramework("modsecurity-snippet")
 
 	It("should add value of modsecurity-snippet setting to nginx config", func() {

test/e2e/settings/multi_accept.go

@@ -24,7 +24,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Multi Accept", func() {
+var _ = framework.DescribeSetting("enable-multi-accept", func() {
 	multiAccept := "enable-multi-accept"
 	f := framework.NewDefaultFramework(multiAccept)
 

test/e2e/settings/no_auth_locations.go

@@ -32,7 +32,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("No Auth locations", func() {
+var _ = framework.DescribeSetting("[Security] no-auth-locations", func() {
 	f := framework.NewDefaultFramework("no-auth-locations")
 
 	setting := "no-auth-locations"

test/e2e/settings/pod_security_policy.go

@@ -38,7 +38,7 @@ const (
 	ingressControllerPSP = "ingress-controller-psp"
 )
 
-var _ = framework.IngressNginxDescribe("Pod Security Policies", func() {
+var _ = framework.IngressNginxDescribe("[Security] Pod Security Policies", func() {
 	f := framework.NewDefaultFramework("pod-security-policies")
 
 	BeforeEach(func() {

test/e2e/settings/pod_security_policy_volumes.go

@@ -34,7 +34,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Pod Security Policies with volumes", func() {
+var _ = framework.IngressNginxDescribe("[Security] Pod Security Policies with volumes", func() {
 	f := framework.NewDefaultFramework("pod-security-policies-volumes")
 
 	It("should be running with a Pod Security Policy", func() {

test/e2e/settings/proxy_host.go

@@ -29,7 +29,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Proxy host variable", func() {
+var _ = framework.IngressNginxDescribe("Dynamic $proxy_host", func() {
 	test := "proxy-host"
 	f := framework.NewDefaultFramework(test)
 

test/e2e/settings/proxy_protocol.go

@@ -28,7 +28,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Proxy Protocol", func() {
+var _ = framework.DescribeSetting("use-proxy-protocol", func() {
 	f := framework.NewDefaultFramework("proxy-protocol")
 
 	setting := "use-proxy-protocol"

test/e2e/settings/server_tokens.go

@@ -27,7 +27,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Server Tokens", func() {
+var _ = framework.DescribeSetting("server-tokens", func() {
 	f := framework.NewDefaultFramework("server-tokens")
 	serverTokens := "server-tokens"
 

test/e2e/settings/tls.go

@@ -34,7 +34,7 @@ func noRedirectPolicyFunc(gorequest.Request, []gorequest.Request) error {
 	return http.ErrUseLastResponse
 }
 
-var _ = framework.IngressNginxDescribe("Settings - TLS)", func() {
+var _ = framework.DescribeSetting("[SSL] TLS protocols, ciphers and headers)", func() {
 	f := framework.NewDefaultFramework("settings-tls")
 	host := "settings-tls"
 

test/e2e/ssl/http_redirect.go

@@ -27,7 +27,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("sslredirect", func() {
+var _ = framework.IngressNginxDescribe("[SSL] redirect to HTTPS", func() {
 	f := framework.NewDefaultFramework("sslredirect")
 
 	BeforeEach(func() {

test/e2e/ssl/secret_update.go

@@ -32,7 +32,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("SSL", func() {
+var _ = framework.IngressNginxDescribe("[SSL] secret update", func() {
 	f := framework.NewDefaultFramework("ssl")
 
 	BeforeEach(func() {

test/e2e/status/update.go

@@ -34,7 +34,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("Status Update [Status]", func() {
+var _ = framework.IngressNginxDescribe("[Status] status update", func() {
 	f := framework.NewDefaultFramework("status-update")
 	host := "status-update"
 	address := getHostIP()
@@ -106,7 +106,7 @@ var _ = framework.IngressNginxDescribe("Status Update [Status]", func() {
 			}
 		}()
 
-		err = wait.Poll(10*time.Second, 4*time.Minute, func() (done bool, err error) {
+		err = wait.Poll(5*time.Second, 4*time.Minute, func() (done bool, err error) {
 			ing, err = f.KubeClientSet.NetworkingV1beta1().Ingresses(f.Namespace).Get(host, metav1.GetOptions{})
 			if err != nil {
 				return false, nil

test/e2e/tcpudp/tcp.go

@@ -34,7 +34,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.IngressNginxDescribe("TCP Feature", func() {
+var _ = framework.IngressNginxDescribe("[TCP] tcp-services", func() {
 	f := framework.NewDefaultFramework("tcp")
 
 	It("should expose a TCP service", func() {