Skip to content

Commit d0b473c

Browse files
committed
Update kubernetes dependencies to 1.21.1
As part of this change, use the resizefs implementation from `k8s.io/mount-utils`. This gets rid of the last reference to `k8s.io/kubernetes`, so we no longer need to vendor it 🎉. While we're here, tidy up the go.mod file a bit by putting all the `replace`s in one stanza. I suspect we ended up with some separated out at the end via previous runs of update-k8s.sh, but I don't see any good reason to keep it that way.
1 parent 745391f commit d0b473c

File tree

711 files changed

+28556
-9952
lines changed

Some content is hidden

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

711 files changed

+28556
-9952
lines changed

driver/node.go

+1-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go.mod

+38-40
Original file line numberDiff line numberDiff line change
@@ -3,62 +3,60 @@ module github.com/digitalocean/csi-digitalocean
33
require (
44
github.com/blang/semver v3.5.1+incompatible
55
github.com/container-storage-interface/spec v1.3.0
6+
github.com/containerd/containerd v1.5.2
67
github.com/digitalocean/go-metadata v0.0.0-20180111002115-15bd36e5f6f7
78
github.com/digitalocean/godo v1.29.0
8-
github.com/docker/docker v17.12.0-ce-rc1.0.20200916142827-bd33bbf0497b+incompatible
9+
github.com/docker/docker v20.10.2+incompatible
10+
github.com/docker/go-connections v0.4.0 // indirect
911
github.com/golang/protobuf v1.4.3
10-
github.com/google/go-cmp v0.5.2
11-
github.com/google/uuid v1.1.2
12+
github.com/google/go-cmp v0.5.4
13+
github.com/google/uuid v1.2.0
14+
github.com/gorilla/mux v1.8.0 // indirect
1215
github.com/kubernetes-csi/csi-test/v4 v4.0.1
1316
github.com/kubernetes-csi/external-snapshotter/v2 v2.1.1
1417
github.com/magiconair/properties v1.8.1
15-
github.com/sirupsen/logrus v1.6.0
18+
github.com/morikuni/aec v1.0.0 // indirect
19+
github.com/sirupsen/logrus v1.7.0
1620
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
17-
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e
18-
golang.org/x/sys v0.0.0-20201112073958-5cba982894dd
19-
google.golang.org/grpc v1.29.1
20-
k8s.io/api v0.20.2
21-
k8s.io/apimachinery v0.20.2
22-
k8s.io/client-go v0.20.2
23-
k8s.io/kubernetes v1.16.2
21+
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
22+
golang.org/x/sys v0.0.0-20210324051608-47abb6519492
23+
google.golang.org/grpc v1.33.2
24+
k8s.io/api v0.21.1
25+
k8s.io/apimachinery v0.21.1
26+
k8s.io/client-go v0.21.1
2427
k8s.io/mount-utils v0.0.0
2528
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
2629
sigs.k8s.io/yaml v1.2.0
2730
)
2831

2932
replace (
30-
k8s.io/api => k8s.io/api v0.20.2
31-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.2
32-
k8s.io/apimachinery => k8s.io/apimachinery v0.21.0-alpha.0
33-
k8s.io/apiserver => k8s.io/apiserver v0.20.2
34-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.20.2
35-
k8s.io/client-go => k8s.io/client-go v0.20.2
36-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.20.2
37-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.20.2
38-
k8s.io/code-generator => k8s.io/code-generator v0.20.3-rc.0
39-
k8s.io/component-base => k8s.io/component-base v0.20.2
40-
k8s.io/cri-api => k8s.io/cri-api v0.20.2-rc.0
41-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.20.2
42-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.20.2
43-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.20.2
44-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.20.2
45-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.20.2
46-
k8s.io/kubectl => k8s.io/kubectl v0.20.2
47-
k8s.io/kubelet => k8s.io/kubelet v0.20.2
48-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.20.2
49-
k8s.io/metrics => k8s.io/metrics v0.20.2
33+
k8s.io/api => k8s.io/api v0.21.1
34+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.1
35+
k8s.io/apimachinery => k8s.io/apimachinery v0.21.2-rc.0
36+
k8s.io/apiserver => k8s.io/apiserver v0.21.1
37+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.1
38+
k8s.io/client-go => k8s.io/client-go v0.21.1
39+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.21.1
40+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.21.1
41+
k8s.io/code-generator => k8s.io/code-generator v0.21.2-rc.0
42+
k8s.io/component-base => k8s.io/component-base v0.21.1
43+
k8s.io/component-helpers => k8s.io/component-helpers v0.21.1
44+
k8s.io/controller-manager => k8s.io/controller-manager v0.21.1
45+
k8s.io/cri-api => k8s.io/cri-api v0.21.2-rc.0
46+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.21.1
47+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.21.1
48+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.21.1
49+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.21.1
50+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.21.1
51+
k8s.io/kubectl => k8s.io/kubectl v0.21.1
52+
k8s.io/kubelet => k8s.io/kubelet v0.21.1
53+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.21.1
54+
k8s.io/metrics => k8s.io/metrics v0.21.1
55+
k8s.io/mount-utils => k8s.io/mount-utils v0.21.2-rc.0
5056
k8s.io/node-api => k8s.io/node-api v0.0.0-20190805144819-9dd62e4d5327
51-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.20.2
57+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.21.1
5258
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.0.0-20190805143616-1485e5142db3
5359
k8s.io/sample-controller => k8s.io/sample-controller v0.0.0-20190805142825-b16fad786282
5460
)
5561

5662
go 1.15
57-
58-
replace k8s.io/kubernetes => k8s.io/kubernetes v1.20.2
59-
60-
replace k8s.io/component-helpers => k8s.io/component-helpers v0.20.2
61-
62-
replace k8s.io/controller-manager => k8s.io/controller-manager v0.20.2
63-
64-
replace k8s.io/mount-utils => k8s.io/mount-utils v0.20.2-rc.0

0 commit comments

Comments
 (0)