diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d016446a658..adff4272052 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ on: paths-ignore: [ '**.md', '**.png', '**.jpg', '**.svg', '**/docs/**' ] env: - GO_VERSION: 1.15 + GO_VERSION: 1.17 jobs: test: diff --git a/.github/workflows/compatibility-e2e.yml b/.github/workflows/compatibility-e2e.yml index bdb6cd4a6dc..9ce608734e0 100644 --- a/.github/workflows/compatibility-e2e.yml +++ b/.github/workflows/compatibility-e2e.yml @@ -2,14 +2,14 @@ name: Compatibility E2E Test on: push: - branches: [main, release-*] + branches: [ main, release-* ] paths-ignore: [ '**.md', '**.png', '**.jpg', '**.svg', '**/docs/**' ] pull_request: - branches: [main, release-*] + branches: [ main, release-* ] paths-ignore: [ '**.md', '**.png', '**.jpg', '**.svg', '**/docs/**' ] env: - GO_VERSION: 1.15 + GO_VERSION: 1.17 KIND_VERSION: v0.11.1 CONTAINERD_VERSION: v1.5.2 KIND_CONFIG_PATH: test/testdata/kind/config.yaml @@ -38,9 +38,10 @@ jobs: - name: Get dependencies run: | - go mod vendor - go get github.com/onsi/ginkgo/ginkgo + go mod download github.com/go-task/slim-sprig + go install github.com/onsi/ginkgo/ginkgo mkdir -p /tmp/artifact + go mod vendor - name: Setup Kind uses: engineerd/setup-kind@v0.5.0 diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index d5510d1eae6..09e1a9a5dd4 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -9,7 +9,7 @@ on: paths-ignore: [ '**.md', '**.png', '**.jpg', '**.svg', '**/docs/**' ] env: - GO_VERSION: 1.15 + GO_VERSION: 1.17 KIND_VERSION: v0.11.1 CONTAINERD_VERSION: v1.5.2 KIND_CONFIG_PATH: test/testdata/kind/config.yaml @@ -33,9 +33,10 @@ jobs: - name: Get dependencies run: | - go mod vendor - go get github.com/onsi/ginkgo/ginkgo + go mod download github.com/go-task/slim-sprig + go install github.com/onsi/ginkgo/ginkgo mkdir -p /tmp/artifact + go mod vendor - name: Setup Kind uses: engineerd/setup-kind@v0.5.0 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index d627844235e..70e5a838199 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -7,7 +7,7 @@ on: branches: [ main, release-* ] env: - GO_VERSION: 1.15 + GO_VERSION: 1.17 jobs: lint: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7dc421e2655..7fd7fc2b25b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,7 +18,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.15 + go-version: 1.17 - name: Check GoReleaser config uses: goreleaser/goreleaser-action@v2 diff --git a/build/images/base/Dockerfile b/build/images/base/Dockerfile index 437ad969447..b5a2f9ab0b2 100644 --- a/build/images/base/Dockerfile +++ b/build/images/base/Dockerfile @@ -11,9 +11,9 @@ RUN apt-get update \ ENV PATH=/go/bin:/usr/local/go/bin:$PATH ENV GOPATH=/go -ENV GOLANG_VERSION 1.16.6 +ENV GOLANG_VERSION 1.17.4 ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz -ENV GOLANG_DOWNLOAD_SHA256 be333ef18b3016e9d7cb7b1ff1fdb0cac800ca0be4cf2290fe613b3d069dfe0d +ENV GOLANG_DOWNLOAD_SHA256 adab2483f644e2f8a10ae93122f0018cef525ca48d0b8764dae87cb5f4fd4206 ARG GOPROXY diff --git a/build/images/cdn/Dockerfile b/build/images/cdn/Dockerfile index c44540729ac..05210d3e5f0 100644 --- a/build/images/cdn/Dockerfile +++ b/build/images/cdn/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.16.6-alpine as builder +FROM golang:1.17.3-alpine3.14 as builder WORKDIR /go/src/d7y.io/dragonfly/v2 diff --git a/build/images/dfdaemon/Dockerfile b/build/images/dfdaemon/Dockerfile index 583eb03f16a..91818cdcdbc 100644 --- a/build/images/dfdaemon/Dockerfile +++ b/build/images/dfdaemon/Dockerfile @@ -1,6 +1,6 @@ -ARG BASE_IMAGE=alpine:3.12 +ARG BASE_IMAGE=alpine:3.14 -FROM golang:1.16.6-alpine as builder +FROM golang:1.17.3-alpine3.14 as builder WORKDIR /go/src/d7y.io/dragonfly/v2 diff --git a/build/images/manager/Dockerfile b/build/images/manager/Dockerfile index 9e3754c7931..307b67c62d1 100644 --- a/build/images/manager/Dockerfile +++ b/build/images/manager/Dockerfile @@ -1,9 +1,9 @@ -ARG BASE_IMAGE=alpine:3.12 +ARG BASE_IMAGE=alpine:3.14 ARG GOPROXY ARG GOTAGS ARG GOGCFLAGS -FROM golang:1.16.6-alpine as server-builder +FROM golang:1.17.3-alpine3.14 as server-builder WORKDIR /go/src/d7y.io/dragonfly/v2 RUN apk --no-cache add bash make gcc libc-dev git COPY . /go/src/d7y.io/dragonfly/v2 diff --git a/build/images/scheduler/Dockerfile b/build/images/scheduler/Dockerfile index 2b927cd5a5f..34d42e435ef 100644 --- a/build/images/scheduler/Dockerfile +++ b/build/images/scheduler/Dockerfile @@ -1,6 +1,6 @@ -ARG BASE_IMAGE=alpine:3.12 +ARG BASE_IMAGE=alpine:3.14 -FROM golang:1.16.6-alpine as builder +FROM golang:1.17.3-alpine3.14 as builder WORKDIR /go/src/d7y.io/dragonfly/v2 diff --git a/go.mod b/go.mod index e427c128340..ac61ba550b5 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module d7y.io/dragonfly/v2 -go 1.15 +go 1.17 require ( github.com/RichardKnop/machinery v1.10.6 @@ -9,7 +9,6 @@ require ( github.com/agiledragon/gomonkey v2.0.2+incompatible github.com/aliyun/aliyun-oss-go-sdk v2.1.6+incompatible github.com/appleboy/gin-jwt/v2 v2.6.5-0.20210827121450-79689222c755 - github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect github.com/casbin/casbin/v2 v2.34.1 github.com/casbin/gorm-adapter/v3 v3.3.2 github.com/colinmarc/hdfs/v2 v2.2.0 @@ -32,17 +31,11 @@ require ( github.com/golang/protobuf v1.5.2 github.com/gomodule/redigo v2.0.0+incompatible github.com/google/go-github v17.0.0+incompatible - github.com/google/go-querystring v1.1.0 // indirect github.com/google/uuid v1.2.0 github.com/gorilla/mux v1.8.0 github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 - github.com/jackc/pgproto3/v2 v2.1.1 // indirect github.com/jarcoal/httpmock v1.0.8 - github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.13.1 // indirect - github.com/mattn/go-isatty v0.0.14 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect github.com/mcuadros/go-gin-prometheus v0.1.0 github.com/mitchellh/mapstructure v1.4.1 github.com/montanaflynn/stats v0.6.6 @@ -50,12 +43,9 @@ require ( github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.14.0 github.com/opencontainers/go-digest v1.0.0 - github.com/opencontainers/image-spec v1.0.2 // indirect - github.com/pelletier/go-toml v1.8.1 // indirect github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.7.1 - github.com/prometheus/procfs v0.6.0 // indirect github.com/schollz/progressbar/v3 v3.8.2 github.com/serialx/hashring v0.0.0-20200727003509-22c0c7ab6b1b github.com/sirupsen/logrus v1.8.1 @@ -65,8 +55,6 @@ require ( github.com/swaggo/files v0.0.0-20210815190702-a29dd2bc99b2 github.com/swaggo/gin-swagger v1.3.1 github.com/swaggo/swag v1.7.1 - github.com/ugorji/go v1.2.6 // indirect - go.mongodb.org/mongo-driver v1.7.2 // indirect go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin v0.20.0 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 go.opentelemetry.io/otel v0.20.0 @@ -79,9 +67,7 @@ require ( golang.org/x/oauth2 v0.0.0-20210201163806-010130855d6c golang.org/x/sync v0.0.0-20210220032951-036812b2e83c golang.org/x/sys v0.0.0-20211124211545-fe61309f8881 - golang.org/x/text v0.3.7 // indirect golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 - golang.org/x/tools v0.1.4 // indirect google.golang.org/api v0.39.0 google.golang.org/grpc v1.39.0 google.golang.org/protobuf v1.27.1 @@ -94,3 +80,125 @@ require ( k8s.io/client-go v11.0.0+incompatible moul.io/zapgorm2 v1.1.0 ) + +require ( + cloud.google.com/go v0.76.0 // indirect + cloud.google.com/go/pubsub v1.10.0 // indirect + github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible // indirect + github.com/KyleBanks/depth v1.2.1 // indirect + github.com/PuerkitoBio/purell v1.1.1 // indirect + github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect + github.com/RichardKnop/logging v0.0.0-20190827224416-1a693bdd4fae // indirect + github.com/aws/aws-sdk-go v1.37.16 // indirect + github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b // indirect + github.com/cespare/xxhash/v2 v2.1.1 // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc // indirect + github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect + github.com/fsnotify/fsnotify v1.4.9 // indirect + github.com/gin-contrib/sse v0.1.0 // indirect + github.com/go-echarts/go-echarts/v2 v2.2.3 // indirect + github.com/go-logr/logr v0.2.0 // indirect + github.com/go-openapi/jsonpointer v0.19.5 // indirect + github.com/go-openapi/jsonreference v0.19.5 // indirect + github.com/go-openapi/spec v0.20.3 // indirect + github.com/go-openapi/swag v0.19.14 // indirect + github.com/go-playground/locales v0.14.0 // indirect + github.com/go-playground/universal-translator v0.18.0 // indirect + github.com/go-redsync/redsync/v4 v4.0.4 // indirect + github.com/go-stack/stack v1.8.0 // indirect + github.com/golang-jwt/jwt/v4 v4.0.0 // indirect + github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe // indirect + github.com/golang/snappy v0.0.3 // indirect + github.com/google/go-cmp v0.5.5 // indirect + github.com/google/go-querystring v1.1.0 // indirect + github.com/googleapis/gax-go/v2 v2.0.5 // indirect + github.com/hashicorp/errwrap v1.1.0 // indirect + github.com/hashicorp/go-multierror v1.1.0 // indirect + github.com/hashicorp/go-uuid v1.0.2 // indirect + github.com/hashicorp/hcl v1.0.0 // indirect + github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/jackc/chunkreader/v2 v2.0.1 // indirect + github.com/jackc/pgconn v1.8.0 // indirect + github.com/jackc/pgio v1.0.0 // indirect + github.com/jackc/pgpassfile v1.0.0 // indirect + github.com/jackc/pgproto3/v2 v2.1.1 // indirect + github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect + github.com/jackc/pgtype v1.6.2 // indirect + github.com/jackc/pgx/v4 v4.10.1 // indirect + github.com/jcmturner/aescts/v2 v2.0.0 // indirect + github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect + github.com/jcmturner/gofork v1.0.0 // indirect + github.com/jcmturner/goidentity/v6 v6.0.1 // indirect + github.com/jcmturner/gokrb5/v8 v8.4.1 // indirect + github.com/jcmturner/rpc/v2 v2.0.2 // indirect + github.com/jinzhu/inflection v1.0.0 // indirect + github.com/jinzhu/now v1.1.2 // indirect + github.com/jmespath/go-jmespath v0.4.0 // indirect + github.com/josharian/intern v1.0.0 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/jstemmer/go-junit-report v0.9.1 // indirect + github.com/kelseyhightower/envconfig v1.4.0 // indirect + github.com/klauspost/compress v1.13.1 // indirect + github.com/leodido/go-urn v1.2.1 // indirect + github.com/magiconair/properties v1.8.1 // indirect + github.com/mailru/easyjson v0.7.6 // indirect + github.com/mattn/go-isatty v0.0.14 // indirect + github.com/mattn/go-runewidth v0.0.13 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect + github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/nxadm/tail v1.4.8 // indirect + github.com/opencontainers/image-spec v1.0.2 // indirect + github.com/opentracing/opentracing-go v1.2.0 // indirect + github.com/pelletier/go-toml v1.8.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/prometheus/client_model v0.2.0 // indirect + github.com/prometheus/common v0.10.0 // indirect + github.com/prometheus/procfs v0.6.0 // indirect + github.com/rivo/uniseg v0.2.0 // indirect + github.com/robfig/cron/v3 v3.0.1 // indirect + github.com/rs/cors v1.7.0 // indirect + github.com/russross/blackfriday/v2 v2.1.0 // indirect + github.com/spf13/afero v1.3.4 // indirect + github.com/spf13/cast v1.3.0 // indirect + github.com/spf13/jwalterweatherman v1.0.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/streadway/amqp v1.0.0 // indirect + github.com/subosito/gotenv v1.2.0 // indirect + github.com/ugorji/go/codec v1.2.6 // indirect + github.com/vmihailenco/bufpool v0.1.11 // indirect + github.com/vmihailenco/go-tinylfu v0.2.0 // indirect + github.com/vmihailenco/msgpack/v5 v5.1.0 // indirect + github.com/vmihailenco/tagparser v0.1.2 // indirect + github.com/xdg-go/pbkdf2 v1.0.0 // indirect + github.com/xdg-go/scram v1.0.2 // indirect + github.com/xdg-go/stringprep v1.0.2 // indirect + github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect + go.mongodb.org/mongo-driver v1.7.2 // indirect + go.opencensus.io v0.22.6 // indirect + go.opentelemetry.io/contrib v0.20.0 // indirect + go.opentelemetry.io/otel/metric v0.20.0 // indirect + go.uber.org/multierr v1.5.0 // indirect + golang.org/x/exp v0.0.0-20201221025956-e89b829e73ea // indirect + golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 // indirect + golang.org/x/mod v0.4.2 // indirect + golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect + golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect + golang.org/x/text v0.3.7 // indirect + golang.org/x/tools v0.1.4 // 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-20210207032614-bba0dbe2a9ea // indirect + gopkg.in/ini.v1 v1.51.0 // indirect + gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gorm.io/driver/postgres v1.0.8 // indirect + gorm.io/driver/sqlserver v1.0.4 // indirect + gorm.io/plugin/dbresolver v1.1.0 // indirect + k8s.io/klog/v2 v2.4.0 // indirect +) diff --git a/go.sum b/go.sum index 5e66e5eda9b..4951648673b 100644 --- a/go.sum +++ b/go.sum @@ -95,7 +95,6 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= -github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b h1:L/QXpzIa3pOvUGt1D1lA5KjYhPBAN/3iWdP7xeFS9F0= github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA= @@ -262,6 +261,7 @@ github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gG github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= 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 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0= github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY= @@ -392,7 +392,6 @@ github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+ github.com/gorilla/sessions v1.2.0 h1:S7P+1Hm5V/AT9cjEcUD5uDaQSX0OE577aCXgoaKpYbQ= github.com/gorilla/sessions v1.2.0/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/grpc-ecosystem/go-grpc-middleware v1.0.0 h1:Iju5GlWwrvL6UBg4zJJt3btmonfrMlCDdsejg4CZE7c= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= diff --git a/hack/build.sh b/hack/build.sh index c50d3fd7581..93d2107878b 100755 --- a/hack/build.sh +++ b/hack/build.sh @@ -10,7 +10,7 @@ SCHEDULER_BINARY_NAME=scheduler MANAGER_BINARY_NAME=manager PKG=d7y.io/dragonfly/v2 -BUILD_IMAGE=golang:1.16.6-alpine +BUILD_IMAGE=golang:1.17.3-alpine3.14 VERSION=$(git rev-parse --short HEAD) BUILD_TIME=$(date -u '+%Y-%m-%dT%H:%M:%SZ') diff --git a/hack/docker-build.sh b/hack/docker-build.sh index 1b8a396eb08..3ca7265438b 100755 --- a/hack/docker-build.sh +++ b/hack/docker-build.sh @@ -10,7 +10,7 @@ cd "${curDir}/../" || return D7Y_VERSION=${D7Y_VERSION:-"latest"} D7Y_REGISTRY=${D7Y_REGISTRY:-d7yio} IMAGES_DIR="build/images" -BASE_IMAGE=${BASE_IMAGE:-alpine:3.12} +BASE_IMAGE=${BASE_IMAGE:-alpine:3.14} CGO_ENABLED=${CGO_ENABLED:-0} GOPROXY=${GOPROXY:-`go env GOPROXY`} diff --git a/hack/install-e2e-test.sh b/hack/install-e2e-test.sh index 06a75e0cf4b..5284b6efd00 100755 --- a/hack/install-e2e-test.sh +++ b/hack/install-e2e-test.sh @@ -47,7 +47,8 @@ install-ginkgo() { if which ginkgo >/dev/null ; then print_step_info "ginkgo has been installed" else - go get github.com/onsi/ginkgo/ginkgo + go mod download github.com/go-task/slim-sprig + go install github.com/onsi/ginkgo/ginkgo fi }