Skip to content

Commit

Permalink
Update golang and k8s mount utils
Browse files Browse the repository at this point in the history
1. k8s.io/mount-utils
2. Use google-api-go-client 0.59.0 (needed for the integration tester to
deploy a cluster with FilestoreCsi Addon config option)
3. use golang 1.17
  • Loading branch information
saikat-royc committed Oct 26, 2021
1 parent c3b5dc2 commit 84f03f9
Show file tree
Hide file tree
Showing 625 changed files with 153,074 additions and 97,352 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

# Build driver go binary
FROM golang:1.14.4 as builder
FROM golang:1.17.2 as builder
WORKDIR /go/src/sigs.k8s.io/gcp-filestore-csi-driver
ADD . .
ARG TAG=latest
Expand Down
2 changes: 1 addition & 1 deletion cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/golang/glog"

"k8s.io/klog"
"k8s.io/utils/mount"
mount "k8s.io/mount-utils"
cloud "sigs.k8s.io/gcp-filestore-csi-driver/pkg/cloud_provider"
"sigs.k8s.io/gcp-filestore-csi-driver/pkg/cloud_provider/metadata"
metadataservice "sigs.k8s.io/gcp-filestore-csi-driver/pkg/cloud_provider/metadata"
Expand Down
65 changes: 51 additions & 14 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
module sigs.k8s.io/gcp-filestore-csi-driver

go 1.14
go 1.17

require (
cloud.google.com/go v0.69.1
cloud.google.com/go v0.97.0
github.com/container-storage-interface/spec v1.3.0
github.com/go-logr/logr v0.2.1 // indirect
github.com/go-logr/logr v0.4.0 // indirect
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
github.com/golang/protobuf v1.4.2
github.com/golang/protobuf v1.5.2
github.com/google/uuid v1.1.2 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/kubernetes-csi/csi-lib-utils v0.8.1
Expand All @@ -17,27 +17,64 @@ require (
github.com/onsi/gomega v1.10.2
github.com/sirupsen/logrus v1.7.0 // indirect
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.6.1 // indirect
golang.org/x/net v0.0.0-20201021035429-f5854403a974
golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43
golang.org/x/sys v0.0.0-20201008064518-c1f3e3309c71 // indirect
google.golang.org/api v0.35.0
google.golang.org/grpc v1.32.0
google.golang.org/protobuf v1.25.0
golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420
golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1
golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac // indirect
google.golang.org/api v0.59.0
google.golang.org/grpc v1.40.0
google.golang.org/protobuf v1.27.1
gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect
gopkg.in/gcfg.v1 v1.2.0
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
k8s.io/apimachinery v0.19.2
k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible
k8s.io/component-base v0.19.0
k8s.io/klog v1.0.0
k8s.io/klog/v2 v2.3.0 // indirect
k8s.io/klog/v2 v2.9.0 // indirect
k8s.io/kubernetes v1.18.0
k8s.io/mount-utils v0.22.2
k8s.io/test-infra v0.0.0-20201007205216-b54c51c3a44a // indirect
k8s.io/utils v0.0.0-20201005171033-6301aaf42dc7
sigs.k8s.io/boskos v0.0.0-20201002225104-ae3497d24cd7
)

require (
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/fsnotify/fsnotify v1.4.9 // indirect
github.com/gogo/protobuf v1.3.1 // indirect
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/googleapis/gax-go/v2 v2.1.1 // indirect
github.com/googleapis/gnostic v0.4.0 // indirect
github.com/hashicorp/go-multierror v1.1.0 // indirect
github.com/imdario/mergo v0.3.9 // indirect
github.com/json-iterator/go v1.1.10 // 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.6.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.9.1 // indirect
github.com/prometheus/procfs v0.0.11 // indirect
go.opencensus.io v0.23.0 // indirect
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect
golang.org/x/text v0.3.6 // indirect
golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 // 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-20211008145708-270636b82663 // 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.2 // indirect
gopkg.in/yaml.v2 v2.3.0 // indirect
k8s.io/api v0.19.0 // indirect
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a // indirect
sigs.k8s.io/structured-merge-diff/v3 v3.0.1-0.20200706213357-43c19bbb7fba // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
)

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

replace k8s.io/apiserver => k8s.io/apiserver v0.18.0
Expand Down
Loading

0 comments on commit 84f03f9

Please sign in to comment.