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

Fix golangci-lint errors (#10196)

Browse source 
* Fix golangci-lint errors

Signed-off-by: z1cheng <imchench@gmail.com>

* Fix dupl errors

Signed-off-by: z1cheng <imchench@gmail.com>

* Fix comments

Signed-off-by: z1cheng <imchench@gmail.com>

* Fix errcheck lint errors

Signed-off-by: z1cheng <imchench@gmail.com>

* Fix assert in e2e test

Signed-off-by: z1cheng <imchench@gmail.com>

* Not interrupt the waitForPodsReady

Signed-off-by: z1cheng <imchench@gmail.com>

* Replace string with constant

Signed-off-by: z1cheng <imchench@gmail.com>

* Fix comments

Signed-off-by: z1cheng <imchench@gmail.com>

* Revert write file permision

Signed-off-by: z1cheng <imchench@gmail.com>

---------

Signed-off-by: z1cheng <imchench@gmail.com>
This commit is contained in:
Chen Chen 2023-08-31 15:36:48 +08:00 • committed by GitHub
parent 46d87d3462
commit b3060bfbd0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
253 changed files with 2434 additions and 2113 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -26,6 +26,8 @@ import (
"k8s.io/ingress-nginx/test/e2e/framework"
)
const fooHost = "foo"
var _ = framework.DescribeAnnotation("server-alias", func() {
f := framework.NewDefaultFramework("alias")
@ -34,7 +36,7 @@ var _ = framework.DescribeAnnotation("server-alias", func() {
})
ginkgo.It("should return status code 200 for host 'foo' and 404 for 'bar'", func() {
host := "foo"
host := fooHost
ing := framework.NewSingleIngress(host, "/", host, f.Namespace, framework.EchoService, 80, nil)
f.EnsureIngress(ing)
@ -60,7 +62,7 @@ var _ = framework.DescribeAnnotation("server-alias", func() {
})
ginkgo.It("should return status code 200 for host 'foo' and 'bar'", func() {
host := "foo"
host := fooHost
annotations := map[string]string{
"nginx.ingress.kubernetes.io/server-alias": "bar",
}
@ -73,7 +75,7 @@ var _ = framework.DescribeAnnotation("server-alias", func() {
return strings.Contains(server, fmt.Sprintf("server_name %v", host))
})
hosts := []string{"foo", "bar"}
hosts := []string{fooHost, "bar"}
for _, host := range hosts {
f.HTTPTestClient().
GET("/").
@ -85,7 +87,7 @@ var _ = framework.DescribeAnnotation("server-alias", func() {
})
ginkgo.It("should return status code 200 for hosts defined in two ingresses, different path with one alias", func() {
host := "foo"
host := fooHost
ing := framework.NewSingleIngress("app-a", "/app-a", host, f.Namespace, framework.EchoService, 80, nil)
f.EnsureIngress(ing)
@ -101,7 +103,7 @@ var _ = framework.DescribeAnnotation("server-alias", func() {
return strings.Contains(server, fmt.Sprintf("server_name %v bar", host))
})
hosts := []string{"foo", "bar"}
hosts := []string{fooHost, "bar"}
for _, host := range hosts {
f.HTTPTestClient().
GET("/app-a").