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

Release v1.8.2 and Update Go to v1.21.1 (#10379)

Browse source 
* Bump Go version to 1.21.1 (#10377)

* Bump Go version to 1.21.1

* Bump testrunner image

* Fix lint error on datadog struct

* Revert lint on 1.8

* Fix http default backend test

* Fix http default backend test

* Fix http default backend test (#10382)
This commit is contained in:
Ricardo Katz 2023-09-08 11:56:15 -03:00 • committed by GitHub
parent a281bf0bf3
commit 6d3a6b6a33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 149 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/e2e-image/Makefile
View file

@ -1,6 +1,6 @@
DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
E2E_BASE_IMAGE ?= "registry.k8s.io/ingress-nginx/e2e-test-runner:v20230623-d50c7193b@sha256:e5c68dc56934c273850bfb75c0348a2819756669baf59fcdce9e16771537b247"
E2E_BASE_IMAGE ?= "registry.k8s.io/ingress-nginx/e2e-test-runner:v20230907-5bb82dcb7@sha256:421cda0f65a949b8b67b5e62a45071702d19ed458a3e2ba753171b0e66943210"
image:
echo "..entered Makefile in /test/e2e-image"

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

@ -49,22 +49,22 @@ var _ = framework.IngressNginxDescribe("[Default Backend]", func() {
{"basic HTTPS POST request without host to path / should return 404", "", framework.HTTPS, "POST", "/", http.StatusNotFound},
{"basic HTTPS POST request without host to path /demo should return 404", "", framework.HTTPS, "POST", "/demo", http.StatusNotFound},
{"basic HTTP GET request to host foo.bar.com and path / should return 404", " foo.bar.com", framework.HTTP, "GET", "/", http.StatusNotFound},
{"basic HTTP GET request to host foo.bar.com and path /demo should return 404", " foo.bar.com", framework.HTTP, "GET", "/demo", http.StatusNotFound},
{"basic HTTPS GET request to host foo.bar.com and path / should return 404", " foo.bar.com", framework.HTTPS, "GET", "/", http.StatusNotFound},
{"basic HTTPS GET request to host foo.bar.com and path /demo should return 404", " foo.bar.com", framework.HTTPS, "GET", "/demo", http.StatusNotFound},
{"basic HTTP GET request to host foo.bar.com and path / should return 404", "foo.bar.com", framework.HTTP, "GET", "/", http.StatusNotFound},
{"basic HTTP GET request to host foo.bar.com and path /demo should return 404", "foo.bar.com", framework.HTTP, "GET", "/demo", http.StatusNotFound},
{"basic HTTPS GET request to host foo.bar.com and path / should return 404", "foo.bar.com", framework.HTTPS, "GET", "/", http.StatusNotFound},
{"basic HTTPS GET request to host foo.bar.com and path /demo should return 404", "foo.bar.com", framework.HTTPS, "GET", "/demo", http.StatusNotFound},
{"basic HTTP POST request to host foo.bar.com and path / should return 404", " foo.bar.com", framework.HTTP, "POST", "/", http.StatusNotFound},
{"basic HTTP POST request to host foo.bar.com and path /demo should return 404", " foo.bar.com", framework.HTTP, "POST", "/demo", http.StatusNotFound},
{"basic HTTPS POST request to host foo.bar.com and path / should return 404", " foo.bar.com", framework.HTTPS, "POST", "/", http.StatusNotFound},
{"basic HTTPS POST request to host foo.bar.com and path /demo should return 404", " foo.bar.com", framework.HTTPS, "POST", "/demo", http.StatusNotFound},
{"basic HTTP POST request to host foo.bar.com and path / should return 404", "foo.bar.com", framework.HTTP, "POST", "/", http.StatusNotFound},
{"basic HTTP POST request to host foo.bar.com and path /demo should return 404", "foo.bar.com", framework.HTTP, "POST", "/demo", http.StatusNotFound},
{"basic HTTPS POST request to host foo.bar.com and path / should return 404", "foo.bar.com", framework.HTTPS, "POST", "/", http.StatusNotFound},
{"basic HTTPS POST request to host foo.bar.com and path /demo should return 404", "foo.bar.com", framework.HTTPS, "POST", "/demo", http.StatusNotFound},
}
framework.Sleep()
for _, test := range testCases {
ginkgo.By(test.Name)
framework.Logf("test running is %s", test.Name)
var req *httpexpect.HTTPRequest
switch test.Scheme {
@ -80,6 +80,8 @@ var _ = framework.IngressNginxDescribe("[Default Backend]", func() {
req.WithHeader("Host", test.Host)
}
framework.Logf("test running req is %+v", req.Request)
req.Expect().
Status(test.Status)
}

1
test/e2e/settings/ocsp/ocsp.go
View file

@ -47,6 +47,7 @@ var _ = framework.DescribeSetting("OCSP", func() {
})
ginkgo.It("should enable OCSP and contain stapling information in the connection", func() {
ginkgo.Skip("Skipped due to a bug with cfssl and Alpine")
host := "www.example.com"
f.UpdateNginxConfigMapData("enable-ocsp", "true")