File tree 1 file changed +10
-2
lines changed
1 file changed +10
-2
lines changed Original file line number Diff line number Diff line change @@ -54,12 +54,20 @@ signal_handler() {
54
54
}
55
55
trap signal_handler INT TERM
56
56
57
- # build kubernetes / node image, e2e binaries
57
+ # build kubernetes / node image, e2e binaries and ginkgo
58
58
build () {
59
59
# build the node image w/ kubernetes
60
60
kind build node-image -v 1
61
+ # Ginkgo v1 is used by Kubernetes 1.24 and earlier and exists in the vendor directory.
62
+ # Historically it has been built with the "vendor" prefix.
63
+ GINKGO_TARGET=" vendor/github.com/onsi/ginkgo/ginkgo"
64
+ if [ ! -d " $GINKGO_TARGET " ]; then
65
+ # If the directory doesn't exist, then we must be on Kubernetes >= 1.25 with Ginkgo V2.
66
+ # The "vendor" prefix is no longer needed.
67
+ GINKGO_TARGET=" github.com/onsi/ginkgo/v2/ginkgo"
68
+ fi
61
69
# make sure we have e2e requirements
62
- make all WHAT=' cmd/kubectl test/e2e/e2e.test vendor/github.com/onsi/ginkgo/ginkgo '
70
+ make all WHAT=" cmd/kubectl test/e2e/e2e.test ${GINKGO_TARGET} "
63
71
}
64
72
65
73
check_structured_log_support () {
You can’t perform that action at this time.
0 commit comments