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

migrate ginkgo to v2 (#8826)

Browse source 
* Migrate ginkgo to v2

* Update test/e2e/annotations/ipwhitelist.go

Co-authored-by: Jintao Zhang <tao12345666333@163.com>

* Update test/e2e/annotations/modsecurity/modsecurity.go

Co-authored-by: Jintao Zhang <tao12345666333@163.com>

* Update test/e2e/settings/access_log.go

Co-authored-by: Jintao Zhang <tao12345666333@163.com>

* remove unnecessary blank line

* re-order packages

* less change

Co-authored-by: Jintao Zhang <tao12345666333@163.com>
This commit is contained in:
Lien Li 2022-08-01 00:16:28 +08:00 committed by GitHub
parent 5e6093cf59
commit 5b0cc8edca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
129 changed files with 152 additions and 156 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
go.mod
View file

@ -15,7 +15,7 @@ require (
github.com/mitchellh/mapstructure v1.5.0
github.com/moul/pb v0.0.0-20220425114252-bca18df4138c
github.com/ncabatoff/process-exporter v0.7.10
github.com/onsi/ginkgo v1.16.5
github.com/onsi/ginkgo/v2 v2.1.4
github.com/opencontainers/runc v1.1.3
github.com/pmezard/go-difflib v1.0.0
github.com/prometheus/client_golang v1.12.2
@ -101,7 +101,6 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
github.com/ncabatoff/go-seq v0.0.0-20180805175032-b08ef85ed833 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/pkg/errors v0.9.1 // indirect
@ -118,20 +117,19 @@ require (
github.com/yudai/gojsondiff v1.0.0 // indirect
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
golang.org/x/mod v0.4.2 // indirect
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff // indirect
golang.org/x/tools v0.1.10 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2 // indirect
google.golang.org/protobuf v1.28.0 // indirect
gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c // indirect

15
go.sum
View file

@ -214,7 +214,6 @@ github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh
github.com/go-openapi/swag v0.19.14 h1:gm3vOOXfiuw5i9p5N9xJvfjvuofpyvLA9Wr6QfK5Fng=
github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/godbus/dbus/v5 v5.0.6 h1:mkgN1ofwASrYnJ5W6U/BxG15eXXXjirgZc7CLqkcaro=
github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
@ -459,7 +458,6 @@ github.com/ncabatoff/process-exporter v0.7.10/go.mod h1:DHZRZjqxw9LCOpLlX0DjBuyn
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@ -467,12 +465,13 @@ github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+
github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
github.com/onsi/ginkgo/v2 v2.1.4 h1:GNapqRSid3zijZ9H77KrgVG4/8KqiyRsxcSxe+7ApXY=
github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU=
github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
github.com/onsi/gomega v1.17.0 h1:9Luw4uT5HTjHTN8+aNcSThgH1vdXnmdJ8xIfZ4wyTRE=
github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw=
github.com/opencontainers/runc v1.1.3 h1:vIXrkId+0/J2Ymu2m7VjGvbSlAId9XNRPhn2p4b+d8w=
github.com/opencontainers/runc v1.1.3/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg=
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 h1:3snG66yBm59tKhhSPQrQ/0bCrv1LQbKt40LnUPiUxdc=
@ -720,8 +719,9 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o=
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@ -854,7 +854,6 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@ -951,14 +950,14 @@ golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82u
golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff h1:VX/uD7MK0AHXGiScH3fsieUQUcpmRERPDYtqZdJnA+Q=
golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff/go.mod h1:YD9qOF0M9xpSpdWTBbzEl5e/RnCefISl8E5Noe10jFM=
golang.org/x/tools v0.1.10 h1:QjFRCZxdOhBJ/UNgnBZLbNV13DlbnK0quyivTnXJM20=
golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

2
test/e2e-image/Makefile
View file

@ -1,6 +1,6 @@
DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
E2E_BASE_IMAGE="k8s.gcr.io/ingress-nginx/e2e-test-runner:v20220110-gfd820db46@sha256:273f7d9b1b2297cd96b4d51600e45d932186a1cc79d00d179dfb43654112fe8f"
E2E_BASE_IMAGE="k8s.gcr.io/ingress-nginx/e2e-test-runner:v20220726-controller-v1.3.0-29-gfe116d62c@sha256:0a199f7b8d4e84026b08c989d9058f3c9b7936af4e2487a6be1ff9077b684d0c"
image:
echo "..entered Makefile in /test/e2e-image"

2
test/e2e/admission/admission.go
View file

@ -24,7 +24,7 @@ import (
"os/exec"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

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

@ -24,7 +24,7 @@ import (
"strings"
"time"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
networking "k8s.io/api/networking/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

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

@ -22,7 +22,7 @@ import (
"reflect"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
"k8s.io/ingress-nginx/test/e2e/framework"

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

@ -21,7 +21,7 @@ import (
"net/http"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"k8s.io/ingress-nginx/test/e2e/framework"
)

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

@ -20,7 +20,7 @@ import (
"net/http"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"k8s.io/ingress-nginx/test/e2e/framework"
)

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

@ -26,7 +26,7 @@ import (
"strings"
"time"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
corev1 "k8s.io/api/core/v1"

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

@ -21,7 +21,7 @@ import (
"net/http"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
"k8s.io/ingress-nginx/test/e2e/framework"
)

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

@ -19,7 +19,7 @@ package annotations
import (
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"k8s.io/ingress-nginx/test/e2e/framework"
)

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

@ -23,7 +23,7 @@ import (
"regexp"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
"k8s.io/ingress-nginx/test/e2e/framework"

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

@ -21,7 +21,7 @@ import (
"net/http"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"k8s.io/ingress-nginx/test/e2e/framework"
)

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

@ -21,7 +21,7 @@ import (
"net/http"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"k8s.io/ingress-nginx/test/e2e/framework"
)

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

@ -20,7 +20,7 @@ import (
"net/http"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"k8s.io/ingress-nginx/test/e2e/framework"
)

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

@ -20,7 +20,7 @@ import (
"fmt"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
networking "k8s.io/api/networking/v1"

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

@ -21,7 +21,7 @@ import (
"net/http"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"k8s.io/ingress-nginx/test/e2e/framework"
)

4
test/e2e/annotations/disableaccesslog.go
View file

@ -17,12 +17,12 @@ limitations under the License.
package annotations
import (
"net/http"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"k8s.io/ingress-nginx/test/e2e/framework"
"net/http"
)
var _ = framework.DescribeAnnotation("disable-access-log disable-http-access-log disable-stream-access-log", func() {

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

@ -20,7 +20,7 @@ import (
"net/http"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
corev1 "k8s.io/api/core/v1"

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

@ -19,7 +19,7 @@ package annotations
import (
"net/http"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"k8s.io/ingress-nginx/test/e2e/framework"
)

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

@ -22,7 +22,7 @@ import (
"net/http"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
"k8s.io/ingress-nginx/test/e2e/framework"

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

@ -21,7 +21,7 @@ import (
"net/http"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
"k8s.io/ingress-nginx/test/e2e/framework"

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

@ -22,7 +22,7 @@ import (
"strings"
pb "github.com/moul/pb/grpcbin/go-grpc"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
"golang.org/x/net/context"
"google.golang.org/grpc"

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

@ -19,7 +19,7 @@ package annotations
import (
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"k8s.io/ingress-nginx/test/e2e/framework"
)

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

@ -26,7 +26,7 @@ import (
"time"
jsoniter "github.com/json-iterator/go"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

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

@ -19,7 +19,8 @@ package annotations
import (
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"k8s.io/ingress-nginx/test/e2e/framework"
)

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

@ -22,7 +22,7 @@ import (
"strings"
"sync"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
"k8s.io/ingress-nginx/test/e2e/framework"

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

@ -21,7 +21,7 @@ import (
"strconv"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"k8s.io/ingress-nginx/test/e2e/framework"
)

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

@ -19,7 +19,7 @@ package annotations
import (
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"k8s.io/ingress-nginx/test/e2e/framework"
)

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

@ -20,7 +20,7 @@ import (
"fmt"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"k8s.io/ingress-nginx/test/e2e/framework"
)

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

@ -20,7 +20,8 @@ import (
"net/http"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"k8s.io/ingress-nginx/test/e2e/framework"
)

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

@ -19,7 +19,7 @@ package annotations
import (
"net/http"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"k8s.io/ingress-nginx/test/e2e/framework"
)

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

@ -20,7 +20,7 @@ import (
"fmt"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"k8s.io/ingress-nginx/test/e2e/framework"
)

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

@ -21,7 +21,7 @@ import (
"net/http"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
"k8s.io/ingress-nginx/test/e2e/framework"

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

@ -22,7 +22,7 @@ import (
"strconv"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"k8s.io/ingress-nginx/test/e2e/framework"
)

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

@ -21,7 +21,7 @@ import (
"net/http"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
"k8s.io/ingress-nginx/test/e2e/framework"

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

@ -23,7 +23,7 @@ import (
"net/url"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
networking "k8s.io/api/networking/v1"

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

@ -20,7 +20,7 @@ import (
"net/http"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"k8s.io/ingress-nginx/test/e2e/framework"
)

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

@ -21,7 +21,7 @@ import (
"net/http"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
"k8s.io/ingress-nginx/test/e2e/framework"

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

@ -20,7 +20,7 @@ import (
"net/http"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"k8s.io/ingress-nginx/test/e2e/framework"
)

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

@ -20,7 +20,7 @@ import (
"net/http"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"k8s.io/ingress-nginx/test/e2e/framework"
)

8
test/e2e/annotations/streamsnippet.go
View file

@ -19,14 +19,14 @@ package annotations
import (
"context"
"fmt"
"net/http"
"strings"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
"net/http"
"strings"
"github.com/onsi/ginkgo"
"k8s.io/ingress-nginx/test/e2e/framework"
)

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

@ -22,7 +22,7 @@ import (
"regexp"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
"k8s.io/apimachinery/pkg/util/wait"

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

@ -19,7 +19,7 @@ package annotations
import (
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"k8s.io/ingress-nginx/test/e2e/framework"
)

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

@ -20,7 +20,7 @@ import (
"net/http"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"k8s.io/ingress-nginx/test/e2e/framework"
)

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

@ -20,7 +20,7 @@ import (
"encoding/json"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
"k8s.io/ingress-nginx/test/e2e/framework"

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

@ -22,7 +22,7 @@ import (
"net/http"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
appsv1 "k8s.io/api/apps/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

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

@ -20,7 +20,7 @@ import (
"net/http"
"github.com/gavv/httpexpect/v2"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
"k8s.io/ingress-nginx/test/e2e/framework"

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

@ -17,7 +17,7 @@ limitations under the License.
package defaultbackend
import (
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
"k8s.io/ingress-nginx/test/e2e/framework"

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

@ -20,7 +20,7 @@ import (
"net/http"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
networking "k8s.io/api/networking/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

5
test/e2e/e2e.go
View file

@ -20,8 +20,7 @@ import (
"os"
"testing"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/config"
"github.com/onsi/ginkgo/v2"
"k8s.io/component-base/logs"
// required
@ -62,6 +61,6 @@ func RunE2ETests(t *testing.T) {
framework.Logf("Using kubectl path '%s'", framework.KubectlPath)
}
framework.Logf("Starting e2e run %q on Ginkgo node %d", framework.RunID, config.GinkgoConfig.ParallelNode)
framework.Logf("Starting e2e run %q on Ginkgo node %d", framework.RunID, ginkgo.GinkgoParallelProcess())
ginkgo.RunSpecs(t, "nginx-ingress-controller e2e suite")
}

2
test/e2e/framework/deployment.go
View file

@ -22,7 +22,7 @@ import (
"os"
"time"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"

2
test/e2e/framework/fastcgi_helloserver.go
View file

@ -17,7 +17,7 @@ limitations under the License.
package framework
import (
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"

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

@ -23,7 +23,7 @@ import (
"time"
"github.com/gavv/httpexpect/v2"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
@ -161,7 +161,7 @@ func (f *Framework) AfterEach() {
}()
}(f.KubeClientSet, f.IngressClass)
if !ginkgo.CurrentGinkgoTestDescription().Failed {
if !ginkgo.CurrentSpecReport().Failed() {
return
}
@ -210,8 +210,8 @@ func DescribeSetting(text string, body func()) bool {
}
// 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...)
func MemoryLeakIt(text string, body interface{}) bool {
return ginkgo.It(text+" [MemoryLeak]", body)
}
// GetNginxIP returns the number of TCP port where NGINX is running

2
test/e2e/framework/grpc_fortune_teller.go
View file

@ -17,7 +17,7 @@ limitations under the License.
package framework
import (
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"

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

@ -17,7 +17,7 @@ limitations under the License.
package framework
import (
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"

2
test/e2e/framework/k8s.go
View file

@ -22,7 +22,7 @@ import (
"strings"
"time"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
appsv1 "k8s.io/api/apps/v1"
api "k8s.io/api/core/v1"

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

@ -33,7 +33,7 @@ import (
"strings"
"time"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

4
test/e2e/framework/test_context.go
View file

@ -18,8 +18,6 @@ package framework
import (
"flag"
"github.com/onsi/ginkgo/config"
)
// TestContextType describes the client context to use in communications with the Kubernetes API.
@ -34,8 +32,6 @@ var TestContext TestContextType
// registerCommonFlags registers flags common to all e2e test suites.
func registerCommonFlags() {
config.GinkgoConfig.EmitSpecProgress = true
flag.StringVar(&TestContext.KubeHost, "kubernetes-host", "http://127.0.0.1:8080", "The kubernetes host, or apiserver, to connect to")
//flag.StringVar(&TestContext.KubeConfig, "kubernetes-config", os.Getenv(clientcmd.RecommendedConfigPathEnvVar), "Path to config containing embedded authinfo for kubernetes. Default value is from environment variable "+clientcmd.RecommendedConfigPathEnvVar)
flag.StringVar(&TestContext.KubeContext, "kubernetes-context", "", "config context to use for kubernetes. If unset, will use value from 'current-context'")

2
test/e2e/framework/util.go
View file

@ -22,7 +22,7 @@ import (
"os"
"time"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
corev1 "k8s.io/api/core/v1"
networkingv1 "k8s.io/api/networking/v1"
rbacv1 "k8s.io/api/rbac/v1"

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

@ -22,7 +22,7 @@ import (
"strings"
"time"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
appsv1 "k8s.io/api/apps/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

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

@ -21,7 +21,7 @@ import (
"strings"
"time"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
"k8s.io/ingress-nginx/test/e2e/framework"

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

@ -17,7 +17,7 @@ limitations under the License.
package gracefulshutdown
import (
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"k8s.io/ingress-nginx/test/e2e/framework"
)

2
test/e2e/ingress/deep_inspection.go
View file

@ -20,7 +20,7 @@ import (
"net/http"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"k8s.io/ingress-nginx/test/e2e/framework"
)

2
test/e2e/ingress/multiple_rules.go
View file

@ -20,7 +20,7 @@ import (
"net/http"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
networking "k8s.io/api/networking/v1"

2
test/e2e/ingress/pathtype_exact.go
View file

@ -20,7 +20,7 @@ import (
"net/http"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
networking "k8s.io/api/networking/v1"

2
test/e2e/ingress/pathtype_mixed.go
View file

@ -20,7 +20,7 @@ import (
"net/http"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
networking "k8s.io/api/networking/v1"

2
test/e2e/ingress/pathtype_prefix.go
View file

@ -20,7 +20,7 @@ import (
"net/http"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"k8s.io/ingress-nginx/test/e2e/framework"
)

2
test/e2e/ingress/without_host.go
View file

@ -21,7 +21,7 @@ import (
"net/http"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
networking "k8s.io/api/networking/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

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

@ -24,7 +24,7 @@ import (
"strings"
"time"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
pool "gopkg.in/go-playground/pool.v3"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

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

@ -19,7 +19,7 @@ package loadbalance
import (
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
"k8s.io/ingress-nginx/test/e2e/framework"

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

@ -22,7 +22,7 @@ import (
"regexp"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
"k8s.io/ingress-nginx/test/e2e/framework"

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

@ -22,7 +22,7 @@ import (
"regexp"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
"k8s.io/ingress-nginx/test/e2e/framework"

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

@ -23,7 +23,7 @@ import (
"strings"
"time"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
dto "github.com/prometheus/client_model/go"
"github.com/prometheus/common/expfmt"
"github.com/prometheus/common/model"

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

@ -24,7 +24,7 @@ import (
"strings"
"time"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
networking "k8s.io/api/networking/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

2
test/e2e/nginx/nginx.go
View file

@ -21,7 +21,7 @@ import (
"net/http"
"time"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"k8s.io/ingress-nginx/test/e2e/framework"
)

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

@ -23,7 +23,7 @@ import (
"strings"
"time"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
"k8s.io/ingress-nginx/test/e2e/framework"

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

@ -20,7 +20,7 @@ import (
"net/http"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
corev1 "k8s.io/api/core/v1"
networking "k8s.io/api/networking/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

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

@ -23,7 +23,7 @@ import (
"strings"
"github.com/gavv/httpexpect/v2"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
corev1 "k8s.io/api/core/v1"
networking "k8s.io/api/networking/v1"

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

@ -20,7 +20,7 @@ import (
"net/http"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
corev1 "k8s.io/api/core/v1"
networking "k8s.io/api/networking/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

3
test/e2e/settings/access_log.go
View file

@ -19,7 +19,8 @@ package settings
import (
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"k8s.io/ingress-nginx/test/e2e/framework"
)

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

@ -21,7 +21,7 @@ import (
"net/http"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"k8s.io/ingress-nginx/test/e2e/framework"
)

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

@ -22,7 +22,7 @@ import (
"strconv"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"k8s.io/ingress-nginx/test/e2e/framework"
)

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

@ -20,7 +20,7 @@ import (
"regexp"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
"k8s.io/ingress-nginx/test/e2e/framework"

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

@ -21,7 +21,7 @@ import (
"net/http"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
"k8s.io/ingress-nginx/test/e2e/framework"

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

@ -22,7 +22,7 @@ import (
"fmt"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
appsv1 "k8s.io/api/apps/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

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

@ -21,7 +21,7 @@ import (
"net/http"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
appsv1 "k8s.io/api/apps/v1"
networking "k8s.io/api/networking/v1"

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

@ -22,7 +22,7 @@ import (
"strings"
"github.com/gavv/httpexpect/v2"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"

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

@ -21,7 +21,7 @@ import (
"net/http"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
"k8s.io/ingress-nginx/test/e2e/framework"

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

@ -21,7 +21,7 @@ import (
"net/http"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
"k8s.io/ingress-nginx/test/e2e/framework"

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

@ -24,7 +24,7 @@ import (
"net/http"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
appsv1 "k8s.io/api/apps/v1"

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

@ -20,7 +20,7 @@ import (
"net/http"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"k8s.io/ingress-nginx/test/e2e/framework"
)

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

@ -23,7 +23,7 @@ import (
"regexp"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

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

@ -21,7 +21,7 @@ import (
"strings"
"syscall"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"k8s.io/ingress-nginx/test/e2e/framework"
)

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

@ -22,7 +22,7 @@ import (
"strconv"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
"k8s.io/ingress-nginx/test/e2e/framework"
)

2
test/e2e/settings/hash-size.go
View file

@ -19,7 +19,7 @@ package settings
import (
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"k8s.io/ingress-nginx/test/e2e/framework"
)

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

@ -23,7 +23,7 @@ import (
"strings"
"sync"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
appsv1 "k8s.io/api/apps/v1"
networkingv1 "k8s.io/api/networking/v1"

2
test/e2e/settings/keep-alive.go
View file

@ -21,7 +21,7 @@ import (
"regexp"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"k8s.io/ingress-nginx/test/e2e/framework"
)

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

@ -20,7 +20,7 @@ import (
"fmt"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"k8s.io/ingress-nginx/test/e2e/framework"
)

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

@ -22,7 +22,7 @@ import (
"net/http"
"strings"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

Some files were not shown because too many files have changed in this diff Show more