Skip to content

Commit

Permalink
Merge pull request #1109 from bertinatto/go117
Browse files Browse the repository at this point in the history
Update to go 1.17
  • Loading branch information
k8s-ci-robot authored Nov 12, 2021
2 parents 939eafb + 32801fa commit 66a74f8
Show file tree
Hide file tree
Showing 46 changed files with 140 additions and 1,447 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM --platform=$BUILDPLATFORM golang:1.16 AS builder
FROM --platform=$BUILDPLATFORM golang:1.17 AS builder
WORKDIR /go/src/github.com/kubernetes-sigs/aws-ebs-csi-driver
COPY . .
ARG OS
Expand Down
67 changes: 64 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@ module github.com/kubernetes-sigs/aws-ebs-csi-driver
require (
github.com/aws/aws-sdk-go v1.40.4
github.com/container-storage-interface/spec v1.3.0
github.com/elazarl/goproxy v0.0.0-20181111060418-2ce16c963a8a // indirect
github.com/golang/mock v1.5.0
github.com/golang/protobuf v1.4.3
github.com/imdario/mergo v0.3.7 // indirect
github.com/kubernetes-csi/csi-proxy/client v1.0.1
github.com/kubernetes-csi/csi-test v2.0.0+incompatible
github.com/kubernetes-csi/external-snapshotter/client/v4 v4.0.0
Expand All @@ -26,6 +24,69 @@ 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/cespare/xxhash/v2 v2.1.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/distribution v2.7.1+incompatible // indirect
github.com/elazarl/goproxy v0.0.0-20181111060418-2ce16c963a8a // indirect
github.com/evanphx/json-patch v4.9.0+incompatible // indirect
github.com/go-logr/logr v0.4.0 // indirect
github.com/gogo/protobuf v1.3.2 // 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/google/uuid v1.1.2 // indirect
github.com/googleapis/gnostic v0.4.1 // indirect
github.com/hashicorp/golang-lru v0.5.1 // indirect
github.com/hpcloud/tail v1.0.0 // indirect
github.com/imdario/mergo v0.3.7 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/json-iterator/go v1.1.10 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/moby/spdystream v0.2.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.7.1 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.10.0 // indirect
github.com/prometheus/procfs v0.2.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/vmware/govmomi v0.20.3 // indirect
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect
golang.org/x/net v0.0.0-20210614182718-04defd469f4e // indirect
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
golang.org/x/text v0.3.6 // indirect
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
google.golang.org/appengine v1.6.5 // indirect
google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a // indirect
google.golang.org/protobuf v1.25.0 // indirect
gopkg.in/fsnotify.v1 v1.4.7 // indirect
gopkg.in/gcfg.v1 v1.2.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/warnings.v0 v0.1.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
k8s.io/apiserver v0.21.0 // indirect
k8s.io/cloud-provider v0.21.0 // indirect
k8s.io/component-helpers v0.21.0 // indirect
k8s.io/csi-translation-lib v0.21.0 // indirect
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 // indirect
k8s.io/kubectl v0.0.0 // indirect
k8s.io/kubelet v0.0.0 // indirect
k8s.io/legacy-cloud-providers v0.0.0 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.1.0 // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
)

replace (
k8s.io/api => k8s.io/api v0.21.0
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.0
Expand Down Expand Up @@ -57,4 +118,4 @@ replace (
vbom.ml/util => github.com/fvbommel/util v0.0.2 // Mitigate https://github.com/fvbommel/util/issues/6
)

go 1.16
go 1.17
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/cespare/xxhash/v2/go.mod

This file was deleted.

Empty file.
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.

1 change: 0 additions & 1 deletion vendor/github.com/hashicorp/golang-lru/go.mod

This file was deleted.

5 changes: 0 additions & 5 deletions vendor/github.com/jmespath/go-jmespath/go.mod

This file was deleted.

11 changes: 0 additions & 11 deletions vendor/github.com/jmespath/go-jmespath/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.

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.

5 changes: 0 additions & 5 deletions vendor/github.com/moby/spdystream/go.mod

This file was deleted.

2 changes: 0 additions & 2 deletions vendor/github.com/moby/spdystream/go.sum

This file was deleted.

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

This file was deleted.

Loading

0 comments on commit 66a74f8

Please sign in to comment.