Skip to content

Commit 64827bf

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #4087 from Ankitasw/bump-ginkgo
chore: Bump ginkgo version
2 parents 9b5ae92 + 00663a4 commit 64827bf

File tree

8 files changed

+60
-49
lines changed

8 files changed

+60
-49
lines changed

‎Makefile

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ CONVERSION_VERIFIER := $(TOOLS_BIN_DIR)/conversion-verifier
5353
DEFAULTER_GEN := $(TOOLS_BIN_DIR)/defaulter-gen
5454
ENVSUBST := $(TOOLS_BIN_DIR)/envsubst
5555
GH := $(TOOLS_BIN_DIR)/gh
56-
GINKGO := $(TOOLS_BIN_DIR)/ginkgo
5756
GOJQ := $(TOOLS_BIN_DIR)/gojq
5857
GOLANGCI_LINT := $(TOOLS_BIN_DIR)/golangci-lint
5958
KIND := $(TOOLS_BIN_DIR)/kind
@@ -398,28 +397,28 @@ test-verbose: setup-envtest ## Run tests with verbose settings.
398397
KUBEBUILDER_ASSETS="$(KUBEBUILDER_ASSETS)" go test -v ./...
399398

400399
.PHONY: test-e2e ## Run e2e tests using clusterctl
401-
test-e2e: $(GINKGO) $(KIND) $(SSM_PLUGIN) $(KUSTOMIZE) generate-test-flavors e2e-image ## Run e2e tests
402-
time $(GINKGO) -tags=e2e $(GINKGO_ARGS) -p ./test/e2e/suites/unmanaged/... -- -config-path="$(E2E_CONF_PATH)" $(E2E_ARGS)
400+
test-e2e: $(KIND) $(SSM_PLUGIN) $(KUSTOMIZE) generate-test-flavors e2e-image ## Run e2e tests
401+
time go run github.com/onsi/ginkgo/v2/ginkgo -tags=e2e $(GINKGO_ARGS) -p ./test/e2e/suites/unmanaged/... -- -config-path="$(E2E_CONF_PATH)" $(E2E_ARGS)
403402

404403
.PHONY: test-e2e-eks ## Run EKS e2e tests using clusterctl
405-
test-e2e-eks: generate-test-flavors $(GINKGO) $(KIND) $(SSM_PLUGIN) $(KUSTOMIZE) e2e-image ## Run eks e2e tests
406-
time $(GINKGO) -tags=e2e $(GINKGO_ARGS) ./test/e2e/suites/managed/... -- -config-path="$(E2E_EKS_CONF_PATH)" --source-template="$(EKS_SOURCE_TEMPLATE)" $(E2E_ARGS) $(EKS_E2E_ARGS)
404+
test-e2e-eks: generate-test-flavors $(KIND) $(SSM_PLUGIN) $(KUSTOMIZE) e2e-image ## Run eks e2e tests
405+
time go run github.com/onsi/ginkgo/v2/ginkgo -tags=e2e $(GINKGO_ARGS) ./test/e2e/suites/managed/... -- -config-path="$(E2E_EKS_CONF_PATH)" --source-template="$(EKS_SOURCE_TEMPLATE)" $(E2E_ARGS) $(EKS_E2E_ARGS)
407406

408407
.PHONY: test-e2e-gc ## Run garbage collection e2e tests using clusterctl
409-
test-e2e-gc: generate-test-flavors $(GINKGO) $(KIND) $(SSM_PLUGIN) $(KUSTOMIZE) e2e-image ## Run eks e2e tests
410-
time $(GINKGO) -tags=e2e -focus="$(GINKGO_FOCUS)" -skip="$(GINKGO_SKIP)" $(GINKGO_ARGS) -p ./test/e2e/suites/gc_unmanaged/... -- -config-path="$(E2E_CONF_PATH)" $(E2E_ARGS)
408+
test-e2e-gc: generate-test-flavors $(KIND) $(SSM_PLUGIN) $(KUSTOMIZE) e2e-image ## Run eks e2e tests
409+
time go run github.com/onsi/ginkgo/v2/ginkgo -tags=e2e -focus="$(GINKGO_FOCUS)" -skip="$(GINKGO_SKIP)" $(GINKGO_ARGS) -p ./test/e2e/suites/gc_unmanaged/... -- -config-path="$(E2E_CONF_PATH)" $(E2E_ARGS)
411410

412411
.PHONY: test-e2e-eks-gc ## Run EKS garbage collection e2e tests using clusterctl
413-
test-e2e-eks-gc: generate-test-flavors $(GINKGO) $(KIND) $(SSM_PLUGIN) $(KUSTOMIZE) e2e-image ## Run eks e2e tests
414-
time $(GINKGO) -tags=e2e -focus="$(GINKGO_FOCUS)" -skip="$(GINKGO_SKIP)" $(GINKGO_ARGS) ./test/e2e/suites/gc_managed/... -- -config-path="$(E2E_EKS_CONF_PATH)" --source-template="$(EKS_SOURCE_TEMPLATE)" $(E2E_ARGS) $(EKS_E2E_ARGS)
412+
test-e2e-eks-gc: generate-test-flavors $(KIND) $(SSM_PLUGIN) $(KUSTOMIZE) e2e-image ## Run eks e2e tests
413+
time go run github.com/onsi/ginkgo/v2/ginkgo -tags=e2e -focus="$(GINKGO_FOCUS)" -skip="$(GINKGO_SKIP)" $(GINKGO_ARGS) ./test/e2e/suites/gc_managed/... -- -config-path="$(E2E_EKS_CONF_PATH)" --source-template="$(EKS_SOURCE_TEMPLATE)" $(E2E_ARGS) $(EKS_E2E_ARGS)
415414

416415

417416
CONFORMANCE_E2E_ARGS ?= -kubetest.config-file=$(KUBETEST_CONF_PATH)
418417
CONFORMANCE_E2E_ARGS += $(E2E_ARGS)
419418
CONFORMANCE_GINKGO_ARGS += $(GINKGO_ARGS)
420419
.PHONY: test-conformance
421-
test-conformance: generate-test-flavors $(GINKGO) $(KIND) $(SSM_PLUGIN) $(KUSTOMIZE) e2e-image ## Run clusterctl based conformance test on workload cluster (requires Docker).
422-
time $(GINKGO) -tags=e2e -focus="conformance" $(CONFORMANCE_GINKGO_ARGS) ./test/e2e/suites/conformance/... -- -config-path="$(E2E_CONF_PATH)" $(CONFORMANCE_E2E_ARGS)
420+
test-conformance: generate-test-flavors $(KIND) $(SSM_PLUGIN) $(KUSTOMIZE) e2e-image ## Run clusterctl based conformance test on workload cluster (requires Docker).
421+
time go run github.com/onsi/ginkgo/v2/ginkgo -tags=e2e -focus="conformance" $(CONFORMANCE_GINKGO_ARGS) ./test/e2e/suites/conformance/... -- -config-path="$(E2E_CONF_PATH)" $(CONFORMANCE_E2E_ARGS)
423422

424423
.PHONY: test-cover
425424
test-cover: setup-envtest ## Run tests with code coverage and code generate reports

‎go.mod

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ require (
1919
github.com/google/go-cmp v0.5.9
2020
github.com/google/goexpect v0.0.0-20210430020637-ab937bf7fd6f
2121
github.com/google/gofuzz v1.2.0
22-
github.com/onsi/ginkgo/v2 v2.8.1
22+
github.com/onsi/ginkgo/v2 v2.8.4
2323
github.com/onsi/gomega v1.27.1
2424
github.com/pkg/errors v0.9.1
2525
github.com/prometheus/client_golang v1.14.0
@@ -79,6 +79,7 @@ require (
7979
github.com/go-openapi/jsonpointer v0.19.6 // indirect
8080
github.com/go-openapi/jsonreference v0.20.1 // indirect
8181
github.com/go-openapi/swag v0.22.3 // indirect
82+
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
8283
github.com/gobuffalo/flect v0.3.0 // indirect
8384
github.com/gogo/protobuf v1.3.2 // indirect
8485
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@@ -88,6 +89,7 @@ require (
8889
github.com/google/go-github/v45 v45.2.0 // indirect
8990
github.com/google/go-querystring v1.1.0 // indirect
9091
github.com/google/goterm v0.0.0-20190703233501-fc88cf888a3f // indirect
92+
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
9193
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
9294
github.com/google/uuid v1.3.0 // indirect
9395
github.com/hashicorp/hcl v1.0.0 // indirect
@@ -144,6 +146,7 @@ require (
144146
golang.org/x/sys v0.5.0 // indirect
145147
golang.org/x/term v0.5.0 // indirect
146148
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
149+
golang.org/x/tools v0.6.0 // indirect
147150
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
148151
google.golang.org/appengine v1.6.7 // indirect
149152
google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90 // indirect

‎go.sum

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/
234234
github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g=
235235
github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
236236
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
237+
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I=
237238
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
238239
github.com/gobuffalo/flect v0.3.0 h1:erfPWM+K1rFNIQeRPdeEXxo8yFr/PO17lhRnS8FUrtk=
239240
github.com/gobuffalo/flect v0.3.0/go.mod h1:5pf3aGnsvqvCj50AVni7mJJF8ICxGZ8HomberC3pXLE=
@@ -324,6 +325,8 @@ github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hf
324325
github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
325326
github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
326327
github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
328+
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
329+
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
327330
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
328331
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 h1:SJ+NtwL6QaZ21U+IrK7d0gGgpjGGvd2kz+FzTHVzdqI=
329332
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2/go.mod h1:Tv1PlzqC9t8wNnpPdctvtSUOPUUg4SHeE6vR1Ir2hmg=
@@ -491,8 +494,8 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108
491494
github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
492495
github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E=
493496
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
494-
github.com/onsi/ginkgo/v2 v2.8.1 h1:xFTEVwOFa1D/Ty24Ws1npBWkDYEV9BqZrsDxVrVkrrU=
495-
github.com/onsi/ginkgo/v2 v2.8.1/go.mod h1:N1/NbDngAFcSLdyZ+/aYTYGSlq9qMCS/cNKGJjy+csc=
497+
github.com/onsi/ginkgo/v2 v2.8.4 h1:gf5mIQ8cLFieruNLAdgijHF1PYfLphKm2dxxcUtcqK0=
498+
github.com/onsi/ginkgo/v2 v2.8.4/go.mod h1:427dEDQZkDKsBvCjc2A/ZPefhKxsTTrsQegMlayL730=
496499
github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
497500
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
498501
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
@@ -959,6 +962,8 @@ golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
959962
golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
960963
golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
961964
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
965+
golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
966+
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
962967
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
963968
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
964969
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎hack/tools/Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,6 @@ $(GH): $(GTAR) $(GH_SHARE)/gh.tar.gz
106106
chmod +x $@
107107
touch -m $@
108108

109-
GINKGO := $(BIN_DIR)/ginkgo
110-
$(GINKGO): $(BIN_DIR) go.mod go.sum
111-
go build -tags=tools -o $@ github.com/onsi/ginkgo/v2/ginkgo
112-
113109
GOJQ := $(BIN_DIR)/gojq
114110
$(GOJQ): $(BIN_DIR) go.mod go.sum
115111
go build -tags=tools -o $@ github.com/itchyny/gojq/cmd/gojq

‎hack/tools/go.mod

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@ module sigs.k8s.io/cluster-api-provider-aws/hack/tools
33
go 1.19
44

55
require (
6-
github.com/a8m/envsubst v1.4.2
6+
github.com/a8m/envsubst v1.3.0
77
github.com/ahmetb/gen-crd-api-reference-docs v0.3.0
88
github.com/golang/mock v1.6.0
99
github.com/golangci/golangci-lint v1.50.1
1010
github.com/itchyny/gojq v0.12.11
1111
github.com/joelanford/go-apidiff v0.5.0
12-
github.com/onsi/ginkgo/v2 v2.8.0
1312
github.com/spf13/pflag v1.0.5
1413
k8s.io/apimachinery v0.26.1
1514
k8s.io/code-generator v0.26.1
@@ -78,7 +77,6 @@ require (
7877
github.com/go-openapi/jsonpointer v0.19.5 // indirect
7978
github.com/go-openapi/jsonreference v0.20.0 // indirect
8079
github.com/go-openapi/swag v0.22.3 // indirect
81-
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
8280
github.com/go-toolsmith/astcast v1.0.0 // indirect
8381
github.com/go-toolsmith/astcopy v1.0.2 // indirect
8482
github.com/go-toolsmith/astequal v1.0.3 // indirect
@@ -104,7 +102,6 @@ require (
104102
github.com/google/gnostic v0.6.9 // indirect
105103
github.com/google/go-cmp v0.5.9 // indirect
106104
github.com/google/gofuzz v1.2.0 // indirect
107-
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
108105
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
109106
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
110107
github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8 // indirect
@@ -160,7 +157,7 @@ require (
160157
github.com/nishanths/exhaustive v0.8.3 // indirect
161158
github.com/nishanths/predeclared v0.2.2 // indirect
162159
github.com/olekukonko/tablewriter v0.0.5 // indirect
163-
github.com/onsi/gomega v1.25.0 // indirect
160+
github.com/onsi/gomega v1.27.0 // indirect
164161
github.com/pelletier/go-toml v1.9.5 // indirect
165162
github.com/pelletier/go-toml/v2 v2.0.5 // indirect
166163
github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d // indirect
@@ -222,12 +219,12 @@ require (
222219
golang.org/x/crypto v0.3.0 // indirect
223220
golang.org/x/exp v0.0.0-20220921164117-439092de6870 // indirect
224221
golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect
225-
golang.org/x/mod v0.7.0 // indirect
226-
golang.org/x/net v0.5.0 // indirect
222+
golang.org/x/mod v0.8.0 // indirect
223+
golang.org/x/net v0.7.0 // indirect
227224
golang.org/x/sync v0.1.0 // indirect
228-
golang.org/x/sys v0.4.0 // indirect
229-
golang.org/x/text v0.6.0 // indirect
230-
golang.org/x/tools v0.5.0 // indirect
225+
golang.org/x/sys v0.5.0 // indirect
226+
golang.org/x/text v0.7.0 // indirect
227+
golang.org/x/tools v0.6.0 // indirect
231228
google.golang.org/protobuf v1.28.1 // indirect
232229
gopkg.in/inf.v0 v0.9.1 // indirect
233230
gopkg.in/ini.v1 v1.67.0 // indirect

0 commit comments

Comments
 (0)