Skip to content

Commit 478d0a6

Browse files
authored
Merge pull request #851 from saikat-royc/release-1.3
Cherrypick #850 - Update go builder to 1.17
2 parents 7f4ec96 + b10938c commit 478d0a6

File tree

44 files changed

+138
-928
lines changed

Some content is hidden

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

44 files changed

+138
-928
lines changed

Dockerfile

+1-1
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

+43-1
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
@@ -32,6 +32,48 @@ require (
3232
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
3333
)
3434

35+
require (
36+
github.com/Microsoft/go-winio v0.4.16 // indirect
37+
github.com/beorn7/perks v1.0.1 // indirect
38+
github.com/blang/semver v3.5.1+incompatible // indirect
39+
github.com/davecgh/go-spew v1.1.1 // indirect
40+
github.com/go-logr/logr v0.2.0 // indirect
41+
github.com/gogo/protobuf v1.3.1 // indirect
42+
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
43+
github.com/google/go-cmp v0.5.2 // indirect
44+
github.com/google/gofuzz v1.1.0 // indirect
45+
github.com/googleapis/gax-go/v2 v2.0.5 // indirect
46+
github.com/googleapis/gnostic v0.3.1 // indirect
47+
github.com/hashicorp/errwrap v1.0.0 // indirect
48+
github.com/hpcloud/tail v1.0.0 // indirect
49+
github.com/imdario/mergo v0.3.8 // indirect
50+
github.com/json-iterator/go v1.1.8 // indirect
51+
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
52+
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
53+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
54+
github.com/modern-go/reflect2 v1.0.1 // indirect
55+
github.com/pkg/errors v0.9.1 // indirect
56+
github.com/prometheus/client_golang v1.0.0 // indirect
57+
github.com/prometheus/client_model v0.2.0 // indirect
58+
github.com/prometheus/common v0.4.1 // indirect
59+
github.com/prometheus/procfs v0.0.8 // indirect
60+
github.com/sirupsen/logrus v1.4.2 // indirect
61+
github.com/spf13/pflag v1.0.5 // indirect
62+
go.opencensus.io v0.22.4 // indirect
63+
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect
64+
golang.org/x/text v0.3.3 // indirect
65+
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
66+
google.golang.org/appengine v1.6.6 // indirect
67+
google.golang.org/protobuf v1.25.0 // indirect
68+
gopkg.in/fsnotify.v1 v1.4.7 // 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.2.8 // indirect
72+
k8s.io/klog/v2 v2.4.0 // indirect
73+
sigs.k8s.io/structured-merge-diff/v3 v3.0.0 // indirect
74+
sigs.k8s.io/yaml v1.2.0 // indirect
75+
)
76+
3577
replace k8s.io/api => k8s.io/api v0.18.0
3678

3779
replace k8s.io/apimachinery => k8s.io/apimachinery v0.18.0

test/run-k8s-integration.sh

+4-5
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

-9
This file was deleted.

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

-16
This file was deleted.

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

-3
This file was deleted.

vendor/github.com/google/gofuzz/go.mod

-3
This file was deleted.

vendor/github.com/google/uuid/go.mod

-1
This file was deleted.

vendor/github.com/googleapis/gax-go/v2/go.mod

-3
This file was deleted.

vendor/github.com/googleapis/gax-go/v2/go.sum

-25
This file was deleted.

vendor/github.com/hashicorp/errwrap/go.mod

-1
This file was deleted.

vendor/github.com/hashicorp/go-multierror/go.mod

-3
This file was deleted.

vendor/github.com/hashicorp/go-multierror/go.sum

-4
This file was deleted.

vendor/github.com/json-iterator/go/go.mod

-11
This file was deleted.

vendor/github.com/json-iterator/go/go.sum

-14
This file was deleted.

vendor/github.com/konsorten/go-windows-terminal-sequences/go.mod

-1
This file was deleted.

vendor/github.com/kubernetes-csi/csi-proxy/client/go.mod

-12
This file was deleted.

vendor/github.com/kubernetes-csi/csi-proxy/client/go.sum

-94
This file was deleted.

vendor/github.com/onsi/gomega/go.mod

-16
This file was deleted.

0 commit comments

Comments
 (0)