Skip to content

Commit 369d2f8

Browse files
kayrusk8s-ci-robot
authored andcommitted
Bump k8s dependency to v1.17.0 and CSI spec to 1.2.0 (#865)
* Bump k8s dependency to v1.17.0-rc.2 * Fix old code to pass tests * Update CSI driver version * Bump dependency to k8s 1.17.0
1 parent ed760b8 commit 369d2f8

File tree

13 files changed

+284
-124
lines changed

13 files changed

+284
-124
lines changed

go.mod

Lines changed: 26 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@ go 1.13
55
require (
66
github.com/NYTimes/gziphandler v1.1.1 // indirect
77
github.com/beorn7/perks v1.0.1 // indirect
8-
github.com/container-storage-interface/spec v1.1.0
8+
github.com/container-storage-interface/spec v1.2.0
99
github.com/coreos/go-systemd v0.0.0-20190620071333-e64a0ec8b42a // indirect
1010
github.com/emicklei/go-restful v2.9.6+incompatible // indirect
1111
github.com/evanphx/json-patch v4.5.0+incompatible // indirect
12-
github.com/go-openapi/swag v0.19.5 // indirect
1312
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect
1413
github.com/golang/protobuf v1.3.2
1514
github.com/google/go-cmp v0.3.1 // indirect
@@ -23,29 +22,26 @@ require (
2322
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
2423
github.com/kubernetes-csi/csi-lib-utils v0.6.1
2524
github.com/kubernetes-csi/csi-test v2.2.0+incompatible
26-
github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e // indirect
2725
github.com/miekg/dns v1.1.16 // indirect
2826
github.com/mitchellh/go-homedir v1.1.0
2927
github.com/mitchellh/mapstructure v1.1.2
3028
github.com/onsi/ginkgo v1.10.1
3129
github.com/onsi/gomega v1.7.0
3230
github.com/pborman/uuid v1.2.0
3331
github.com/pelletier/go-toml v1.4.0 // indirect
34-
github.com/pkg/errors v0.8.1 // indirect
3532
github.com/prometheus/client_golang v1.0.0
3633
github.com/sirupsen/logrus v1.4.2
3734
github.com/spf13/cobra v0.0.5
38-
github.com/spf13/pflag v1.0.3
35+
github.com/spf13/pflag v1.0.5
3936
github.com/spf13/viper v1.4.0
4037
github.com/stretchr/testify v1.4.0
4138
golang.org/x/crypto v0.0.0-20191122220453-ac88ee75c92c
42-
golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297
39+
golang.org/x/net v0.0.0-20191004110552-13f9640d40b9
4340
golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9
4441
google.golang.org/appengine v1.6.2 // indirect
4542
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 // indirect
4643
google.golang.org/grpc v1.23.1
4744
gopkg.in/gcfg.v1 v1.2.3
48-
gopkg.in/inf.v0 v0.9.1 // indirect
4945
gopkg.in/square/go-jose.v2 v2.3.1 // indirect
5046
gopkg.in/warnings.v0 v0.1.2 // indirect
5147
gopkg.in/yaml.v2 v2.2.7
@@ -56,33 +52,32 @@ require (
5652
k8s.io/cloud-provider v0.0.0
5753
k8s.io/component-base v0.0.0
5854
k8s.io/klog v1.0.0
59-
k8s.io/kube-openapi v0.0.0-20190918143330-0270cf2f1c1d // indirect
60-
k8s.io/kubernetes v1.17.0-beta.1
61-
k8s.io/utils v0.0.0-20191030222137-2b95a09bc58d
55+
k8s.io/kubernetes v1.17.0
56+
k8s.io/utils v0.0.0-20191114184206-e782cd3c129f
6257
sigs.k8s.io/sig-storage-lib-external-provisioner v0.0.0-20190807214443-c525773885fc
6358
)
6459

6560
replace (
6661
github.com/opencontainers/runc => github.com/opencontainers/runc v1.0.0-rc9
67-
k8s.io/api => k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20191105135202-3d13137d1b45
68-
k8s.io/apiextensions-apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20191105135202-3d13137d1b45
69-
k8s.io/apimachinery => k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20191105135202-3d13137d1b45
70-
k8s.io/apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20191105135202-3d13137d1b45
71-
k8s.io/cli-runtime => k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20191105135202-3d13137d1b45
72-
k8s.io/client-go => k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20191105135202-3d13137d1b45
73-
k8s.io/cloud-provider => k8s.io/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20191105135202-3d13137d1b45
74-
k8s.io/cluster-bootstrap => k8s.io/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20191105135202-3d13137d1b45
75-
k8s.io/code-generator => k8s.io/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20191105135202-3d13137d1b45
76-
k8s.io/component-base => k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20191105135202-3d13137d1b45
77-
k8s.io/cri-api => k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20191105135202-3d13137d1b45
78-
k8s.io/csi-translation-lib => k8s.io/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20191105135202-3d13137d1b45
79-
k8s.io/kube-aggregator => k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20191105135202-3d13137d1b45
80-
k8s.io/kube-controller-manager => k8s.io/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20191105135202-3d13137d1b45
81-
k8s.io/kube-proxy => k8s.io/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20191105135202-3d13137d1b45
82-
k8s.io/kube-scheduler => k8s.io/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20191105135202-3d13137d1b45
83-
k8s.io/kubectl => k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20191105135202-3d13137d1b45
84-
k8s.io/kubelet => k8s.io/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20191105135202-3d13137d1b45
85-
k8s.io/legacy-cloud-providers => k8s.io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20191105135202-3d13137d1b45
86-
k8s.io/metrics => k8s.io/kubernetes/staging/src/k8s.io/metrics v0.0.0-20191105135202-3d13137d1b45
87-
k8s.io/sample-apiserver => k8s.io/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20191105135202-3d13137d1b45
62+
k8s.io/api => k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20191206012503-70132b0f130a
63+
k8s.io/apiextensions-apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20191206012503-70132b0f130a
64+
k8s.io/apimachinery => k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20191206012503-70132b0f130a
65+
k8s.io/apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20191206012503-70132b0f130a
66+
k8s.io/cli-runtime => k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20191206012503-70132b0f130a
67+
k8s.io/client-go => k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20191206012503-70132b0f130a
68+
k8s.io/cloud-provider => k8s.io/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20191206012503-70132b0f130a
69+
k8s.io/cluster-bootstrap => k8s.io/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20191206012503-70132b0f130a
70+
k8s.io/code-generator => k8s.io/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20191206012503-70132b0f130a
71+
k8s.io/component-base => k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20191206012503-70132b0f130a
72+
k8s.io/cri-api => k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20191206012503-70132b0f130a
73+
k8s.io/csi-translation-lib => k8s.io/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20191206012503-70132b0f130a
74+
k8s.io/kube-aggregator => k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20191206012503-70132b0f130a
75+
k8s.io/kube-controller-manager => k8s.io/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20191206012503-70132b0f130a
76+
k8s.io/kube-proxy => k8s.io/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20191206012503-70132b0f130a
77+
k8s.io/kube-scheduler => k8s.io/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20191206012503-70132b0f130a
78+
k8s.io/kubectl => k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20191206012503-70132b0f130a
79+
k8s.io/kubelet => k8s.io/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20191206012503-70132b0f130a
80+
k8s.io/legacy-cloud-providers => k8s.io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20191206012503-70132b0f130a
81+
k8s.io/metrics => k8s.io/kubernetes/staging/src/k8s.io/metrics v0.0.0-20191206012503-70132b0f130a
82+
k8s.io/sample-apiserver => k8s.io/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20191206012503-70132b0f130a
8883
)

0 commit comments

Comments
 (0)