Skip to content

Commit 41bba8a

Browse files
authored
Merge pull request #850 from mattcary/go1.17
Update go builder to 1.17
2 parents b1836cd + 8c08569 commit 41bba8a

File tree

55 files changed

+149
-1121
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+149
-1121
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
ARG BUILDPLATFORM
1616

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

1919
ARG STAGINGVERSION
2020
ARG TARGETPLATFORM

go.mod

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module sigs.k8s.io/gcp-compute-persistent-disk-csi-driver
22

3-
go 1.13
3+
go 1.17
44

55
require (
66
cloud.google.com/go v0.65.0
@@ -29,6 +29,53 @@ require (
2929
k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9
3030
)
3131

32+
require (
33+
github.com/Microsoft/go-winio v0.4.16 // indirect
34+
github.com/beorn7/perks v1.0.1 // indirect
35+
github.com/blang/semver v3.5.1+incompatible // indirect
36+
github.com/cespare/xxhash/v2 v2.1.1 // indirect
37+
github.com/davecgh/go-spew v1.1.1 // indirect
38+
github.com/fsnotify/fsnotify v1.4.9 // indirect
39+
github.com/go-logr/logr v0.4.0 // indirect
40+
github.com/gogo/protobuf v1.3.2 // indirect
41+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
42+
github.com/google/go-cmp v0.5.5 // indirect
43+
github.com/google/gofuzz v1.1.0 // indirect
44+
github.com/googleapis/gax-go/v2 v2.0.5 // indirect
45+
github.com/googleapis/gnostic v0.5.5 // indirect
46+
github.com/hashicorp/errwrap v1.0.0 // indirect
47+
github.com/hashicorp/go-multierror v1.0.0 // indirect
48+
github.com/imdario/mergo v0.3.8 // indirect
49+
github.com/json-iterator/go v1.1.11 // indirect
50+
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
51+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
52+
github.com/modern-go/reflect2 v1.0.1 // indirect
53+
github.com/nxadm/tail v1.4.5 // indirect
54+
github.com/pkg/errors v0.9.1 // indirect
55+
github.com/prometheus/client_golang v1.11.0 // indirect
56+
github.com/prometheus/client_model v0.2.0 // indirect
57+
github.com/prometheus/common v0.26.0 // indirect
58+
github.com/prometheus/procfs v0.6.0 // indirect
59+
github.com/sirupsen/logrus v1.8.1 // indirect
60+
github.com/spf13/pflag v1.0.5 // indirect
61+
go.opencensus.io v0.22.4 // indirect
62+
golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 // indirect
63+
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
64+
golang.org/x/text v0.3.6 // indirect
65+
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
66+
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
67+
google.golang.org/appengine v1.6.6 // indirect
68+
google.golang.org/protobuf v1.26.0 // indirect
69+
gopkg.in/inf.v0 v0.9.1 // indirect
70+
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
71+
gopkg.in/yaml.v2 v2.4.0 // indirect
72+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
73+
k8s.io/api v0.22.0 // indirect
74+
k8s.io/klog/v2 v2.9.0 // indirect
75+
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
76+
sigs.k8s.io/yaml v1.2.0 // indirect
77+
)
78+
3279
replace (
3380
k8s.io/api => k8s.io/api v0.22.0
3481
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.22.0

test/run-k8s-integration.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,10 @@ readonly GCE_PD_TEST_FOCUS="PersistentVolumes\sGCEPD|[V|v]olume\sexpand|\[sig-st
3434
make -C "${PKGDIR}" test-k8s-integration
3535

3636
if [ "$use_kubetest2" = true ]; then
37-
export GO111MODULE=on;
38-
go get sigs.k8s.io/kubetest2@latest;
39-
go get sigs.k8s.io/kubetest2/kubetest2-gce@latest;
40-
go get sigs.k8s.io/kubetest2/kubetest2-gke@latest;
41-
go get sigs.k8s.io/kubetest2/kubetest2-tester-ginkgo@latest;
37+
go install sigs.k8s.io/kubetest2@latest;
38+
go install sigs.k8s.io/kubetest2/kubetest2-gce@latest;
39+
go install sigs.k8s.io/kubetest2/kubetest2-gke@latest;
40+
go install sigs.k8s.io/kubetest2/kubetest2-tester-ginkgo@latest;
4241
fi
4342

4443
base_cmd="${PKGDIR}/bin/k8s-integration-test \

vendor/github.com/Microsoft/go-winio/go.mod

Lines changed: 0 additions & 9 deletions
This file was deleted.

vendor/github.com/Microsoft/go-winio/go.sum

Lines changed: 0 additions & 16 deletions
This file was deleted.

vendor/github.com/cespare/xxhash/v2/go.mod

Lines changed: 0 additions & 3 deletions
This file was deleted.

vendor/github.com/cespare/xxhash/v2/go.sum

Whitespace-only changes.

vendor/github.com/fsnotify/fsnotify/go.mod

Lines changed: 0 additions & 5 deletions
This file was deleted.

vendor/github.com/fsnotify/fsnotify/go.sum

Lines changed: 0 additions & 2 deletions
This file was deleted.

vendor/github.com/go-logr/logr/go.mod

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)