DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup and standardization of e2e test definitions (#5090)

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2020-02-16 15:27:58 -03:00 committed by GitHub
parent 45c9f94b17
commit cc318cdec1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
76 changed files with 90 additions and 133 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/e2e/annotations/affinity.go
View file

@ -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() {

2
test/e2e/annotations/alias.go
View file

@ -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() {

2
test/e2e/annotations/approot.go
View file

@ -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() {

2
test/e2e/annotations/auth.go
View file

@ -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() {

2
test/e2e/annotations/authtls.go
View file

@ -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() {

2
test/e2e/annotations/backendprotocol.go
View file

@ -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() {

2
test/e2e/annotations/canary.go
View file

@ -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() {

2
test/e2e/annotations/clientbodybuffersize.go
View file

@ -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() {

2
test/e2e/annotations/connection.go
View file

@ -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() {

2
test/e2e/annotations/cors.go
View file

@ -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() {

2
test/e2e/annotations/customhttperrors.go
View file

@ -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() {

2
test/e2e/annotations/default_backend.go
View file

@ -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() {

2
test/e2e/annotations/fastcgi.go
View file

@ -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() {

2
test/e2e/annotations/forcesslredirect.go
View file

@ -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() {

2
test/e2e/annotations/fromtowwwredirect.go
View file

@ -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() {

2
test/e2e/annotations/grpc.go
View file

@ -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() {

2
test/e2e/annotations/http2pushpreload.go
View file

@ -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() {

2
test/e2e/annotations/influxdb.go
View file

@ -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() {

2
test/e2e/annotations/ipwhitelist.go
View file

@ -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() {

2
test/e2e/annotations/log.go
View file

@ -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() {

2
test/e2e/annotations/mirror.go
View file

@ -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"

2
test/e2e/annotations/modsecurity.go
View file

@ -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() {

2
test/e2e/annotations/proxy.go
View file

@ -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"

2
test/e2e/annotations/proxyssl.go
View file

@ -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() {

2
test/e2e/annotations/redirect.go
View file

@ -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() {

2
test/e2e/annotations/rewrite.go
View file

@ -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() {

2
test/e2e/annotations/satisfy.go
View file

@ -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() {

2
test/e2e/annotations/serversnippet.go
View file

@ -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() {

2
test/e2e/annotations/snippet.go
View file

@ -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() {

2
test/e2e/annotations/sslciphers.go
View file

@ -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() {

2
test/e2e/annotations/upstreamhashby.go
View file

@ -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() {

2
test/e2e/annotations/upstreamvhost.go
View file

@ -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() {

2
test/e2e/annotations/xforwardedprefix.go
View file

@ -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() {

2
test/e2e/dbg/main.go
View file

@ -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"

2
test/e2e/defaultbackend/custom_default_backend.go
View file

@ -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() {

2
test/e2e/defaultbackend/default_backend.go
View file

@ -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() {

2
test/e2e/defaultbackend/ssl.go
View file

@ -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() {

2
test/e2e/defaultbackend/with_hosts.go
View file

@ -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"

10
test/e2e/framework/framework.go
View file

@ -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...)

2
test/e2e/gracefulshutdown/shutdown.go
View file

@ -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"

2
test/e2e/gracefulshutdown/slow_requests.go
View file

@ -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() {

2
test/e2e/leaks/lua_ssl.go
View file

@ -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() {

2
test/e2e/loadbalance/configmap.go
View file

@ -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() {

8
test/e2e/loadbalance/ewma.go
View file

@ -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.UpdateNginxConfigMapData("load-balance", "ewma")
f.SetNginxConfigMapData(map[string]string{
"worker-processes": "2",
"load-balance": "ewma"},
)
})
It("does not fail requests", func() {

6
test/e2e/loadbalance/round_robin.go
View file

@ -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"

2
test/e2e/lua/dynamic_certificates.go
View file

@ -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"

2
test/e2e/lua/dynamic_configuration.go
View file

@ -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() {

2
test/e2e/security/request_smuggling.go
View file

@ -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() {

2
test/e2e/servicebackend/service_backend.go
View file

@ -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() {

2
test/e2e/servicebackend/service_externalname.go
View file

@ -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() {

7
test/e2e/settings/configmap_change.go
View file

@ -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 := ""

2
test/e2e/settings/custom_header.go
View file

@ -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"

46
test/e2e/settings/customize_health_check_path.go
View file

@ -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())
})
})
})

2
test/e2e/settings/default_ssl_certificate.go
View file

@ -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"

2
test/e2e/settings/disable_catch_all.go
View file

@ -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() {

2
test/e2e/settings/forwarded_headers.go
View file

@ -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"

2
test/e2e/settings/geoip2.go
View file

@ -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"

4
test/e2e/settings/global_access_block.go
View file

@ -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).

2
test/e2e/settings/global_external_auth.go
View file

@ -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"

2
test/e2e/settings/ingress_class.go
View file

@ -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() {

2
test/e2e/settings/listen_nondefault_ports.go
View file

@ -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"

2
test/e2e/settings/lua_shared_dicts.go
View file

@ -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"

2
test/e2e/settings/main_snippet.go
View file

@ -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"

2
test/e2e/settings/modsecurity_snippet.go
View file

@ -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() {

2
test/e2e/settings/multi_accept.go
View file

@ -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)

2
test/e2e/settings/no_auth_locations.go
View file

@ -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"

2
test/e2e/settings/pod_security_policy.go
View file

@ -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() {

2
test/e2e/settings/pod_security_policy_volumes.go
View file

@ -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() {

2
test/e2e/settings/proxy_host.go
View file

@ -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)

2
test/e2e/settings/proxy_protocol.go
View file

@ -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"

2
test/e2e/settings/server_tokens.go
View file

@ -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"

2
test/e2e/settings/tls.go
View file

@ -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"

2
test/e2e/ssl/http_redirect.go
View file

@ -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() {

2
test/e2e/ssl/secret_update.go
View file

@ -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() {

4
test/e2e/status/update.go
View file

@ -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

2
test/e2e/tcpudp/tcp.go
View file

@ -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() {