Skip to content

Commit 084bda7

Browse files
committed
feat: ReadWriteOncePod support
1 parent 82a87cc commit 084bda7

File tree

7 files changed

+428
-253
lines changed

7 files changed

+428
-253
lines changed

go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/Azure/go-autorest/autorest v0.11.20
88
github.com/Azure/go-autorest/autorest/adal v0.9.15
99
github.com/Azure/go-autorest/autorest/to v0.4.0
10-
github.com/container-storage-interface/spec v1.3.0
10+
github.com/container-storage-interface/spec v1.5.0
1111
github.com/golang/mock v1.6.0
1212
github.com/golang/protobuf v1.5.2
1313
github.com/imdario/mergo v0.3.9 // indirect
@@ -33,7 +33,6 @@ require (
3333
)
3434

3535
replace (
36-
github.com/container-storage-interface/spec => github.com/container-storage-interface/spec v1.3.0
3736
github.com/niemeyer/pretty => github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e
3837
github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.7.1
3938
go.etcd.io/etcd => go.etcd.io/etcd v0.0.0-20200410171415-59f5fb25a533

go.sum

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,10 @@ github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX
120120
github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313/go.mod h1:P1wt9Z3DP8O6W3rvwCt0REIlshg1InHImaLW0t3ObY0=
121121
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
122122
github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
123-
github.com/container-storage-interface/spec v1.3.0 h1:wMH4UIoWnK/TXYw8mbcIHgZmB6kHOeIsYsiaTJwa6bc=
123+
github.com/container-storage-interface/spec v1.2.0/go.mod h1:6URME8mwIBbpVyZV93Ce5St17xBiQJQY67NDsuohiy4=
124124
github.com/container-storage-interface/spec v1.3.0/go.mod h1:6URME8mwIBbpVyZV93Ce5St17xBiQJQY67NDsuohiy4=
125+
github.com/container-storage-interface/spec v1.5.0 h1:lvKxe3uLgqQeVQcrnL2CPQKISoKjTJxojEs9cBk+HXo=
126+
github.com/container-storage-interface/spec v1.5.0/go.mod h1:8K96oQNkJ7pFcC2R9Z1ynGGBB1I93kcS6PGg3SsOk8s=
125127
github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59/go.mod h1:pA0z1pT8KYB3TCXK/ocprsh7MAkoW8bZVzPdih9snmM=
126128
github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw=
127129
github.com/containerd/console v1.0.1/go.mod h1:XUsP6YE/mKtz6bxc+I8UiKKTP04qjQL4qcS3XoQ5xkw=

pkg/blob/blob.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,8 @@ func (d *Driver) Run(endpoint, kubeconfig string, testBool bool) {
192192
d.AddVolumeCapabilityAccessModes([]csi.VolumeCapability_AccessMode_Mode{
193193
csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
194194
csi.VolumeCapability_AccessMode_SINGLE_NODE_READER_ONLY,
195+
csi.VolumeCapability_AccessMode_SINGLE_NODE_SINGLE_WRITER,
196+
csi.VolumeCapability_AccessMode_SINGLE_NODE_MULTI_WRITER,
195197
csi.VolumeCapability_AccessMode_MULTI_NODE_READER_ONLY,
196198
csi.VolumeCapability_AccessMode_MULTI_NODE_SINGLE_WRITER,
197199
csi.VolumeCapability_AccessMode_MULTI_NODE_MULTI_WRITER,

pkg/csi-common/controllerserver-default_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,16 @@ func TestValidateVolumeCapabilities(t *testing.T) {
3232
d.AddVolumeCapabilityAccessModes([]csi.VolumeCapability_AccessMode_Mode{
3333
csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
3434
csi.VolumeCapability_AccessMode_SINGLE_NODE_READER_ONLY,
35+
csi.VolumeCapability_AccessMode_SINGLE_NODE_SINGLE_WRITER,
36+
csi.VolumeCapability_AccessMode_SINGLE_NODE_MULTI_WRITER,
3537
csi.VolumeCapability_AccessMode_MULTI_NODE_READER_ONLY,
3638
})
3739

3840
capability := []*csi.VolumeCapability{
3941
{AccessMode: NewVolumeCapabilityAccessMode(csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER)},
4042
{AccessMode: NewVolumeCapabilityAccessMode(csi.VolumeCapability_AccessMode_SINGLE_NODE_READER_ONLY)},
43+
{AccessMode: NewVolumeCapabilityAccessMode(csi.VolumeCapability_AccessMode_SINGLE_NODE_SINGLE_WRITER)},
44+
{AccessMode: NewVolumeCapabilityAccessMode(csi.VolumeCapability_AccessMode_SINGLE_NODE_MULTI_WRITER)},
4145
{AccessMode: NewVolumeCapabilityAccessMode(csi.VolumeCapability_AccessMode_MULTI_NODE_READER_ONLY)},
4246
}
4347
capabilityDisjoint := []*csi.VolumeCapability{

test/sanity/run-tests-all-clouds.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ function install_csi_sanity_bin {
2323
mkdir -p $GOPATH/src/github.com/kubernetes-csi
2424
pushd $GOPATH/src/github.com/kubernetes-csi
2525
export GO111MODULE=off
26-
git clone https://github.com/kubernetes-csi/csi-test.git -b v4.0.2
26+
git clone https://github.com/kubernetes-csi/csi-test.git -b v4.2.0
2727
pushd csi-test/cmd/csi-sanity
2828
make install
2929
popd

0 commit comments

Comments
 (0)