Skip to content

Cherrypick #850 - Update go builder to 1.17 #851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 20, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

ARG BUILDPLATFORM

FROM --platform=$BUILDPLATFORM golang:1.13.15 as builder
FROM --platform=$BUILDPLATFORM golang:1.17.2 as builder

ARG STAGINGVERSION
ARG TARGETPLATFORM
Expand Down
44 changes: 43 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module sigs.k8s.io/gcp-compute-persistent-disk-csi-driver

go 1.13
go 1.17

require (
cloud.google.com/go v0.65.0
Expand Down Expand Up @@ -32,6 +32,48 @@ require (
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
)

require (
github.com/Microsoft/go-winio v0.4.16 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver v3.5.1+incompatible // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/go-logr/logr v0.2.0 // indirect
github.com/gogo/protobuf v1.3.1 // indirect
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
github.com/google/go-cmp v0.5.2 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/googleapis/gax-go/v2 v2.0.5 // indirect
github.com/googleapis/gnostic v0.3.1 // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/hpcloud/tail v1.0.0 // indirect
github.com/imdario/mergo v0.3.8 // indirect
github.com/json-iterator/go v1.1.8 // indirect
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.0.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.4.1 // indirect
github.com/prometheus/procfs v0.0.8 // indirect
github.com/sirupsen/logrus v1.4.2 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.opencensus.io v0.22.4 // indirect
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect
golang.org/x/text v0.3.3 // indirect
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
google.golang.org/appengine v1.6.6 // indirect
google.golang.org/protobuf v1.25.0 // indirect
gopkg.in/fsnotify.v1 v1.4.7 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.2.8 // indirect
k8s.io/klog/v2 v2.4.0 // indirect
sigs.k8s.io/structured-merge-diff/v3 v3.0.0 // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
)

replace k8s.io/api => k8s.io/api v0.18.0

replace k8s.io/apimachinery => k8s.io/apimachinery v0.18.0
Expand Down
9 changes: 4 additions & 5 deletions test/run-k8s-integration.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,10 @@ readonly GCE_PD_TEST_FOCUS="PersistentVolumes\sGCEPD|[V|v]olume\sexpand|\[sig-st
make -C "${PKGDIR}" test-k8s-integration

if [ "$use_kubetest2" = true ]; then
export GO111MODULE=on;
go get sigs.k8s.io/kubetest2@latest;
go get sigs.k8s.io/kubetest2/kubetest2-gce@latest;
go get sigs.k8s.io/kubetest2/kubetest2-gke@latest;
go get sigs.k8s.io/kubetest2/kubetest2-tester-ginkgo@latest;
go install sigs.k8s.io/kubetest2@latest;
go install sigs.k8s.io/kubetest2/kubetest2-gce@latest;
go install sigs.k8s.io/kubetest2/kubetest2-gke@latest;
go install sigs.k8s.io/kubetest2/kubetest2-tester-ginkgo@latest;
fi

base_cmd="${PKGDIR}/bin/k8s-integration-test \
Expand Down
9 changes: 0 additions & 9 deletions vendor/github.com/Microsoft/go-winio/go.mod

This file was deleted.

16 changes: 0 additions & 16 deletions vendor/github.com/Microsoft/go-winio/go.sum

This file was deleted.

3 changes: 0 additions & 3 deletions vendor/github.com/go-logr/logr/go.mod

This file was deleted.

3 changes: 0 additions & 3 deletions vendor/github.com/google/gofuzz/go.mod

This file was deleted.

1 change: 0 additions & 1 deletion vendor/github.com/google/uuid/go.mod

This file was deleted.

3 changes: 0 additions & 3 deletions vendor/github.com/googleapis/gax-go/v2/go.mod

This file was deleted.

25 changes: 0 additions & 25 deletions vendor/github.com/googleapis/gax-go/v2/go.sum

This file was deleted.

1 change: 0 additions & 1 deletion vendor/github.com/hashicorp/errwrap/go.mod

This file was deleted.

3 changes: 0 additions & 3 deletions vendor/github.com/hashicorp/go-multierror/go.mod

This file was deleted.

4 changes: 0 additions & 4 deletions vendor/github.com/hashicorp/go-multierror/go.sum

This file was deleted.

11 changes: 0 additions & 11 deletions vendor/github.com/json-iterator/go/go.mod

This file was deleted.

14 changes: 0 additions & 14 deletions vendor/github.com/json-iterator/go/go.sum

This file was deleted.

This file was deleted.

12 changes: 0 additions & 12 deletions vendor/github.com/kubernetes-csi/csi-proxy/client/go.mod

This file was deleted.

94 changes: 0 additions & 94 deletions vendor/github.com/kubernetes-csi/csi-proxy/client/go.sum

This file was deleted.

16 changes: 0 additions & 16 deletions vendor/github.com/onsi/gomega/go.mod

This file was deleted.

Loading