Skip to content

Commit 2501f6e

Browse files
thaJeztahthaJeztah
committed
csi: remove unused startMockServer and github.com/rexray/gocsi dependency
This utility was used in manager/volumes/volumes_test.go, which got deleted in b0a1aa6, making the startMockServer unused. Remove the file, so that we can remove the problematic github.com/rexray/gocsi dependency, which is unmaintained, and required us to use Drew's fork to prevent legacy dependencies from being pulled in through the indirect github.com/coreos/etcd/clientv3 dependency; go: finding module for package github.com/coreos/etcd/clientv3/concurrency go: finding module for package github.com/coreos/etcd/clientv3 go: found github.com/coreos/etcd/clientv3 in github.com/coreos/etcd v3.3.27+incompatible go: found github.com/coreos/etcd/clientv3/concurrency in github.com/coreos/etcd v3.3.27+incompatible go: finding module for package github.com/coreos/go-systemd/journal go: finding module for package github.com/coreos/pkg/capnslog go: found github.com/coreos/pkg/capnslog in github.com/coreos/pkg v0.0.0-20240122114842-bbd7aa9bf6fb go: found github.com/coreos/go-systemd/journal in github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf The above resolution resulted in these legacy versions to be added; github.com/coreos/etcd v3.3.27+incompatible // indirect github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect github.com/coreos/pkg v0.0.0-20240122114842-bbd7aa9bf6fb // indirect Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent ea1a7ce commit 2501f6e

Some content is hidden

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

50 files changed

+628
-8459
lines changed

‎go.mod

+3-9
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@ go 1.18
55
require (
66
code.cloudfoundry.org/clock v1.1.0
77
github.com/Microsoft/go-winio v0.6.1
8-
github.com/akutz/memconn v0.1.0
98
github.com/bits-and-blooms/bitset v1.13.0
109
github.com/cloudflare/cfssl v1.6.4
1110
github.com/container-storage-interface/spec v1.2.0
1211
github.com/distribution/reference v0.5.0
1312
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c
1413
github.com/docker/go-metrics v0.0.1
15-
github.com/dustin/go-humanize v1.0.0 // indirect
1614
github.com/fernet/fernet-go v0.0.0-20211208181803-9f70042a33ee
1715
github.com/gogo/protobuf v1.3.2
1816
github.com/golang/protobuf v1.5.3
@@ -23,12 +21,9 @@ require (
2321
github.com/opencontainers/go-digest v1.0.0
2422
github.com/phayes/permbits v0.0.0-20190612203442-39d7c581d2ee
2523
github.com/pkg/errors v0.9.1
26-
github.com/prometheus/client_golang v1.14.0 // indirect
2724
github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a
28-
github.com/rexray/gocsi v1.2.2 // replaced; see replace rules for the version used.
2925
github.com/sirupsen/logrus v1.9.3
3026
github.com/spf13/cobra v1.7.0
31-
github.com/spf13/pflag v1.0.5 // indirect
3227
github.com/stretchr/testify v1.8.4
3328
go.etcd.io/bbolt v1.3.7
3429
go.etcd.io/etcd/client/pkg/v3 v3.5.6
@@ -56,10 +51,10 @@ require (
5651
)
5752

5853
require (
59-
github.com/akutz/gosync v0.1.0 // indirect
6054
github.com/beorn7/perks v1.0.1 // indirect
6155
github.com/cespare/xxhash/v2 v2.2.0 // indirect
6256
github.com/davecgh/go-spew v1.1.1 // indirect
57+
github.com/dustin/go-humanize v1.0.0 // indirect
6358
github.com/fsnotify/fsnotify v1.6.0 // indirect
6459
github.com/go-logr/logr v1.2.4 // indirect
6560
github.com/google/certificate-transparency-go v1.1.4 // indirect
@@ -71,9 +66,11 @@ require (
7166
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
7267
github.com/nxadm/tail v1.4.8 // indirect
7368
github.com/pmezard/go-difflib v1.0.0 // indirect
69+
github.com/prometheus/client_golang v1.14.0 // indirect
7470
github.com/prometheus/client_model v0.3.0 // indirect
7571
github.com/prometheus/common v0.42.0 // indirect
7672
github.com/prometheus/procfs v0.9.0 // indirect
73+
github.com/spf13/pflag v1.0.5 // indirect
7774
github.com/weppos/publicsuffix-go v0.15.1-0.20210511084619-b1f36a2d6c0b // indirect
7875
github.com/zmap/zcrypto v0.0.0-20210511125630-18f1e0152cfc // indirect
7976
github.com/zmap/zlint/v3 v3.1.0 // indirect
@@ -90,6 +87,3 @@ require (
9087
gopkg.in/yaml.v3 v3.0.1 // indirect
9188
k8s.io/klog/v2 v2.90.1 // indirect
9289
)
93-
94-
// Removes etcd dependency
95-
replace github.com/rexray/gocsi => github.com/dperny/gocsi v1.2.3-pre

‎go.sum

-12
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym
1818
github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
1919
github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
2020
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
21-
github.com/akutz/gosync v0.1.0 h1:naxPT/aDYDh79PMwM3XmencmNQeYmpNFSZy4ZE9zIW0=
22-
github.com/akutz/gosync v0.1.0/go.mod h1:I8I4aiqJI1nqaeYOOB1WS+CgRJVVPqhct9Y4njywM84=
23-
github.com/akutz/memconn v0.1.0 h1:NawI0TORU4hcOMsMr11g7vwlCdkYeLKXBcxWu2W/P8A=
24-
github.com/akutz/memconn v0.1.0/go.mod h1:Jo8rI7m0NieZyLI5e2CDlRdRqRRB4S7Xp77ukDjH+Fw=
2521
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
2622
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
2723
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
@@ -86,8 +82,6 @@ github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c h1:+pKlWGMw7gf6bQ
8682
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA=
8783
github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQV8=
8884
github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw=
89-
github.com/dperny/gocsi v1.2.3-pre h1:GRTvl8G6yEXYPyul1h6YAqtyxzUHTrQHo6G3xZpb9oM=
90-
github.com/dperny/gocsi v1.2.3-pre/go.mod h1:qQw5mIunz1RqMUfZcGJ9/Lt9EDaL0N3wPNYxFTuyLQo=
9185
github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
9286
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
9387
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -271,13 +265,11 @@ github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI
271265
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
272266
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
273267
github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
274-
github.com/onsi/ginkgo v1.4.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
275268
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
276269
github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
277270
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
278271
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
279272
github.com/onsi/ginkgo/v2 v2.9.2 h1:BA2GMJOtfGAfagzYtrAlufIP0lq6QERkFmHLMLPwFSU=
280-
github.com/onsi/gomega v1.3.0/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
281273
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
282274
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
283275
github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE=
@@ -352,12 +344,10 @@ github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE
352344
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
353345
github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
354346
github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
355-
github.com/spf13/cobra v0.0.1/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
356347
github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo=
357348
github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
358349
github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
359350
github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
360-
github.com/spf13/pflag v1.0.0/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
361351
github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
362352
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
363353
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
@@ -373,8 +363,6 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU
373363
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
374364
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
375365
github.com/tedsuo/ifrit v0.0.0-20230330192023-5cba443a66c4 h1:MGZzzxBuPuK4J0XQo+0uy0NnXQGKzHXhYp5oG1Wy860=
376-
github.com/thecodeteam/gosync v0.1.0 h1:RcD9owCaiK0Jg1rIDPgirdcLCL1jCD6XlDVSg0MfHmE=
377-
github.com/thecodeteam/gosync v0.1.0/go.mod h1:43QHsngcnWc8GE1aCmi7PEypslflHjCzXFleuWKEb00=
378366
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
379367
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
380368
github.com/weppos/publicsuffix-go v0.13.1-0.20210123135404-5fd73613514e/go.mod h1:HYux0V0Zi04bHNwOHy4cXJVz/TQjYonnF6aoYhj+3QE=

‎manager/csi/csi_mock_test.go

-51
This file was deleted.

0 commit comments

Comments
 (0)