diff --git a/build.env b/build.env index 428c90a43..05df1d4e0 100644 --- a/build.env +++ b/build.env @@ -16,7 +16,7 @@ BASE_IMAGE=docker.io/ceph/ceph:v16 CEPH_VERSION=octopus # standard Golang options -GOLANG_VERSION=1.15.5 +GOLANG_VERSION=1.16.4 GO111MODULE=on # static checks and linters diff --git a/docs/development-guide.md b/docs/development-guide.md index b68d876c6..08c822616 100644 --- a/docs/development-guide.md +++ b/docs/development-guide.md @@ -13,7 +13,7 @@ it is **highly** encouraged to: ### Workspace and repository setup -* [Download](https://golang.org/dl/) Go (>=1.13.x) and +* [Download](https://golang.org/dl/) Go (>=1.16.x) and [install](https://golang.org/doc/install) it on your system. * Setup the [GOPATH](http://www.g33knotes.org/2014/07/60-second-count-down-to-go.html) environment. diff --git a/go.mod b/go.mod index 641cf988b..be99179b1 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/ceph/ceph-csi -go 1.13 +go 1.16 require ( github.com/aws/aws-sdk-go v1.38.8 diff --git a/scripts/check-env.sh b/scripts/check-env.sh index 0b94143b8..490861f65 100755 --- a/scripts/check-env.sh +++ b/scripts/check-env.sh @@ -60,9 +60,9 @@ else fi # parse the Golang version, return the digit passed as argument -# 1.13.9 -> go_version 1 -> 1 -# 1.13.9 -> go_version 2 -> 13 -# 1.13.9 -> go_version 3 -> 9 +# 1.16.4 -> go_version 1 -> 1 +# 1.16.4 -> go_version 2 -> 16 +# 1.16.4 -> go_version 3 -> 4 go_version() { go version | cut -d' ' -f3 | sed 's/^go//' | cut -d'.' -f"${1}" } diff --git a/vendor/modules.txt b/vendor/modules.txt index f0832db6e..510a9e9dd 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,4 +1,5 @@ # github.com/aws/aws-sdk-go v1.38.8 +## explicit github.com/aws/aws-sdk-go/aws github.com/aws/aws-sdk-go/aws/awserr github.com/aws/aws-sdk-go/aws/awsutil @@ -47,6 +48,7 @@ github.com/beorn7/perks/quantile # github.com/blang/semver v3.5.1+incompatible github.com/blang/semver # github.com/ceph/go-ceph v0.8.0 +## explicit github.com/ceph/go-ceph/cephfs/admin github.com/ceph/go-ceph/internal/callbacks github.com/ceph/go-ceph/internal/cutil @@ -58,10 +60,13 @@ github.com/ceph/go-ceph/rbd # github.com/cespare/xxhash/v2 v2.1.1 github.com/cespare/xxhash/v2 # github.com/container-storage-interface/spec v1.3.0 +## explicit github.com/container-storage-interface/spec/lib/go/csi # github.com/csi-addons/replication-lib-utils v0.2.0 +## explicit github.com/csi-addons/replication-lib-utils/protosanitizer # github.com/csi-addons/spec v0.1.0 +## explicit github.com/csi-addons/spec/lib/go/replication # github.com/davecgh/go-spew v1.1.1 github.com/davecgh/go-spew/spew @@ -76,6 +81,7 @@ github.com/evanphx/json-patch # github.com/fatih/color v1.9.0 github.com/fatih/color # github.com/go-logr/logr v0.2.1 +## explicit github.com/go-logr/logr # github.com/gogo/protobuf v1.3.1 github.com/gogo/protobuf/proto @@ -83,6 +89,7 @@ github.com/gogo/protobuf/sortkeys # github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e github.com/golang/groupcache/lru # github.com/golang/protobuf v1.5.2 => github.com/golang/protobuf v1.4.3 +## explicit github.com/golang/protobuf/descriptor github.com/golang/protobuf/proto github.com/golang/protobuf/protoc-gen-go/descriptor @@ -108,8 +115,10 @@ github.com/googleapis/gnostic/compiler github.com/googleapis/gnostic/extensions github.com/googleapis/gnostic/openapiv2 # github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4 +## explicit github.com/grpc-ecosystem/go-grpc-middleware # github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 +## explicit github.com/grpc-ecosystem/go-grpc-prometheus # github.com/hashicorp/errwrap v1.0.0 github.com/hashicorp/errwrap @@ -142,6 +151,7 @@ github.com/hashicorp/hcl/json/token github.com/hashicorp/vault/command/agent/auth github.com/hashicorp/vault/command/agent/auth/kubernetes # github.com/hashicorp/vault/api v1.0.5-0.20200902155336-f9d5ce5a171a => github.com/hashicorp/vault/api v1.0.5-0.20200902155336-f9d5ce5a171a +## explicit github.com/hashicorp/vault/api # github.com/hashicorp/vault/sdk v0.1.14-0.20200519221838-e0cfd64bc267 => github.com/hashicorp/vault/sdk v0.1.14-0.20201116234512-b4d4137dfe8b github.com/hashicorp/vault/sdk/helper/compressutil @@ -163,16 +173,19 @@ github.com/jmespath/go-jmespath # github.com/json-iterator/go v1.1.10 github.com/json-iterator/go # github.com/kubernetes-csi/csi-lib-utils v0.7.0 +## explicit github.com/kubernetes-csi/csi-lib-utils/connection github.com/kubernetes-csi/csi-lib-utils/metrics github.com/kubernetes-csi/csi-lib-utils/protosanitizer github.com/kubernetes-csi/csi-lib-utils/rpc # github.com/kubernetes-csi/external-snapshotter/v2 v2.1.1 => github.com/kubernetes-csi/external-snapshotter/v2 v2.1.1-0.20200504125226-859696c419ff +## explicit github.com/kubernetes-csi/external-snapshotter/v2/pkg/apis/volumesnapshot/v1beta1 github.com/kubernetes-csi/external-snapshotter/v2/pkg/client/clientset/versioned github.com/kubernetes-csi/external-snapshotter/v2/pkg/client/clientset/versioned/scheme github.com/kubernetes-csi/external-snapshotter/v2/pkg/client/clientset/versioned/typed/volumesnapshot/v1beta1 # github.com/libopenstorage/secrets v0.0.0-20201006135900-af310b01fe47 +## explicit github.com/libopenstorage/secrets github.com/libopenstorage/secrets/vault # github.com/mattn/go-colorable v0.1.6 @@ -190,6 +203,7 @@ github.com/modern-go/concurrent # github.com/modern-go/reflect2 v1.0.1 github.com/modern-go/reflect2 # github.com/onsi/ginkgo v1.12.0 +## explicit github.com/onsi/ginkgo github.com/onsi/ginkgo/config github.com/onsi/ginkgo/internal/codelocation @@ -209,6 +223,7 @@ github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty github.com/onsi/ginkgo/types # github.com/onsi/gomega v1.9.0 +## explicit github.com/onsi/gomega github.com/onsi/gomega/format github.com/onsi/gomega/internal/assertion @@ -224,6 +239,7 @@ github.com/onsi/gomega/types # github.com/opencontainers/go-digest v1.0.0 github.com/opencontainers/go-digest # github.com/pborman/uuid v1.2.0 +## explicit github.com/pborman/uuid # github.com/pierrec/lz4 v2.5.2+incompatible github.com/pierrec/lz4 @@ -233,6 +249,7 @@ github.com/pkg/errors # github.com/pmezard/go-difflib v1.0.0 github.com/pmezard/go-difflib/difflib # github.com/prometheus/client_golang v1.7.1 +## explicit github.com/prometheus/client_golang/prometheus github.com/prometheus/client_golang/prometheus/internal github.com/prometheus/client_golang/prometheus/promhttp @@ -253,9 +270,11 @@ github.com/ryanuber/go-glob # github.com/spf13/pflag v1.0.5 github.com/spf13/pflag # github.com/stretchr/testify v1.7.0 +## explicit github.com/stretchr/testify/assert github.com/stretchr/testify/require # golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 +## explicit golang.org/x/crypto/blowfish golang.org/x/crypto/chacha20 golang.org/x/crypto/curve25519 @@ -284,6 +303,7 @@ golang.org/x/net/trace golang.org/x/oauth2 golang.org/x/oauth2/internal # golang.org/x/sys v0.0.0-20201112073958-5cba982894dd +## explicit golang.org/x/sys/cpu golang.org/x/sys/internal/unsafeheader golang.org/x/sys/plan9 @@ -330,6 +350,7 @@ google.golang.org/appengine/urlfetch # google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a google.golang.org/genproto/googleapis/rpc/status # google.golang.org/grpc v1.36.1 => google.golang.org/grpc v1.35.0 +## explicit google.golang.org/grpc google.golang.org/grpc/attributes google.golang.org/grpc/backoff @@ -423,6 +444,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c gopkg.in/yaml.v3 # k8s.io/api v0.20.0 => k8s.io/api v0.20.0 +## explicit k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 k8s.io/api/admissionregistration/v1 @@ -469,6 +491,7 @@ k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 # k8s.io/apimachinery v0.20.0 => k8s.io/apimachinery v0.20.0 +## explicit k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors k8s.io/apimachinery/pkg/api/meta @@ -562,6 +585,7 @@ k8s.io/apiserver/pkg/util/feature k8s.io/apiserver/pkg/util/webhook k8s.io/apiserver/pkg/warning # k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible => k8s.io/client-go v0.20.0 +## explicit k8s.io/client-go/discovery k8s.io/client-go/discovery/cached/memory k8s.io/client-go/dynamic @@ -750,6 +774,7 @@ k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/workqueue # k8s.io/cloud-provider v0.20.0 => k8s.io/cloud-provider v0.20.0 +## explicit k8s.io/cloud-provider k8s.io/cloud-provider/volume k8s.io/cloud-provider/volume/helpers @@ -766,6 +791,7 @@ k8s.io/controller-manager/pkg/clientbuilder # k8s.io/klog v1.0.0 k8s.io/klog # k8s.io/klog/v2 v2.4.0 +## explicit k8s.io/klog/v2 # k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd k8s.io/kube-openapi/pkg/util/proto @@ -775,6 +801,7 @@ k8s.io/kubectl/pkg/util/podutils # k8s.io/kubelet v0.0.0 => k8s.io/kubelet v0.20.0 k8s.io/kubelet/pkg/apis/stats/v1alpha1 # k8s.io/kubernetes v1.20.0 +## explicit k8s.io/kubernetes/pkg/api/legacyscheme k8s.io/kubernetes/pkg/api/service k8s.io/kubernetes/pkg/api/v1/pod @@ -834,8 +861,10 @@ k8s.io/kubernetes/test/e2e/storage/utils k8s.io/kubernetes/test/utils k8s.io/kubernetes/test/utils/image # k8s.io/mount-utils v0.20.0 => k8s.io/mount-utils v0.20.0 +## explicit k8s.io/mount-utils # k8s.io/utils v0.0.0-20201110183641-67b214c5f920 +## explicit k8s.io/utils/buffer k8s.io/utils/exec k8s.io/utils/integer @@ -851,6 +880,7 @@ k8s.io/utils/trace sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/client sigs.k8s.io/apiserver-network-proxy/konnectivity-client/proto/client # sigs.k8s.io/controller-runtime v0.6.0 +## explicit sigs.k8s.io/controller-runtime/pkg/cache sigs.k8s.io/controller-runtime/pkg/cache/internal sigs.k8s.io/controller-runtime/pkg/client @@ -884,3 +914,34 @@ sigs.k8s.io/controller-runtime/pkg/webhook/internal/metrics sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.2.0 sigs.k8s.io/yaml +# github.com/golang/protobuf => github.com/golang/protobuf v1.4.3 +# github.com/hashicorp/vault/api => github.com/hashicorp/vault/api v1.0.5-0.20200902155336-f9d5ce5a171a +# github.com/hashicorp/vault/sdk => github.com/hashicorp/vault/sdk v0.1.14-0.20201116234512-b4d4137dfe8b +# github.com/kubernetes-csi/external-snapshotter/v2 => github.com/kubernetes-csi/external-snapshotter/v2 v2.1.1-0.20200504125226-859696c419ff +# github.com/kubernetes-incubator/external-storage => github.com/kubernetes-incubator/external-storage v5.5.0+incompatible +# google.golang.org/grpc => google.golang.org/grpc v1.35.0 +# k8s.io/api => k8s.io/api v0.20.0 +# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.0 +# k8s.io/apimachinery => k8s.io/apimachinery v0.20.0 +# k8s.io/apiserver => k8s.io/apiserver v0.20.0 +# k8s.io/cli-runtime => k8s.io/cli-runtime v0.20.0 +# k8s.io/client-go => k8s.io/client-go v0.20.0 +# k8s.io/cloud-provider => k8s.io/cloud-provider v0.20.0 +# k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.20.0 +# k8s.io/code-generator => k8s.io/code-generator v0.20.0 +# k8s.io/component-base => k8s.io/component-base v0.20.0 +# k8s.io/component-helpers => k8s.io/component-helpers v0.20.0 +# k8s.io/controller-manager => k8s.io/controller-manager v0.20.0 +# k8s.io/cri-api => k8s.io/cri-api v0.20.0 +# k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.20.0 +# k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.20.0 +# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.20.0 +# k8s.io/kube-proxy => k8s.io/kube-proxy v0.20.0 +# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.20.0 +# k8s.io/kubectl => k8s.io/kubectl v0.20.0 +# k8s.io/kubelet => k8s.io/kubelet v0.20.0 +# k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.20.0 +# k8s.io/metrics => k8s.io/metrics v0.20.0 +# k8s.io/mount-utils => k8s.io/mount-utils v0.20.0 +# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.20.0 +# vbom.ml/util => github.com/fvbommel/util v0.0.0-20180919145318-efcd4e0f9787