Skip to content

Commit 1625193

Browse files
authored
Merge pull request #314 from chrishenzie/single-node-access-modes
Advertise SINGLE_NODE_MULTI_WRITER capability
2 parents 8647adb + 939075f commit 1625193

File tree

6 files changed

+339
-251
lines changed

6 files changed

+339
-251
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/kubernetes-csi/csi-driver-host-path
33
go 1.16
44

55
require (
6-
github.com/container-storage-interface/spec v1.4.0
6+
github.com/container-storage-interface/spec v1.5.0
77
github.com/go-logr/logr v0.3.0 // indirect
88
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
99
github.com/golang/protobuf v1.4.3

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnht
9494
github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
9595
github.com/codegangsta/negroni v1.0.0/go.mod h1:v0y3T5G7Y1UlFfyxFn/QLRU4a2EuNau2iZY63YTKWo0=
9696
github.com/container-storage-interface/spec v1.2.0/go.mod h1:6URME8mwIBbpVyZV93Ce5St17xBiQJQY67NDsuohiy4=
97-
github.com/container-storage-interface/spec v1.4.0 h1:ozAshSKxpJnYUfmkpZCTYyF/4MYeYlhdXbAvPvfGmkg=
98-
github.com/container-storage-interface/spec v1.4.0/go.mod h1:6URME8mwIBbpVyZV93Ce5St17xBiQJQY67NDsuohiy4=
97+
github.com/container-storage-interface/spec v1.5.0 h1:lvKxe3uLgqQeVQcrnL2CPQKISoKjTJxojEs9cBk+HXo=
98+
github.com/container-storage-interface/spec v1.5.0/go.mod h1:8K96oQNkJ7pFcC2R9Z1ynGGBB1I93kcS6PGg3SsOk8s=
9999
github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59/go.mod h1:pA0z1pT8KYB3TCXK/ocprsh7MAkoW8bZVzPdih9snmM=
100100
github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw=
101101
github.com/containerd/console v1.0.0/go.mod h1:8Pf4gM6VEbTNRIT26AyyU7hxdQU3MvAvxVI0sc00XBE=

pkg/hostpath/controllerserver.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -797,6 +797,7 @@ func (hp *hostPath) getControllerServiceCapabilities() []*csi.ControllerServiceC
797797
csi.ControllerServiceCapability_RPC_LIST_VOLUMES,
798798
csi.ControllerServiceCapability_RPC_CLONE_VOLUME,
799799
csi.ControllerServiceCapability_RPC_VOLUME_CONDITION,
800+
csi.ControllerServiceCapability_RPC_SINGLE_NODE_MULTI_WRITER,
800801
}
801802
if hp.config.EnableVolumeExpansion {
802803
cl = append(cl, csi.ControllerServiceCapability_RPC_EXPAND_VOLUME)

pkg/hostpath/nodeserver.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,13 @@ func (hp *hostPath) NodeGetCapabilities(ctx context.Context, req *csi.NodeGetCap
382382
},
383383
},
384384
},
385+
{
386+
Type: &csi.NodeServiceCapability_Rpc{
387+
Rpc: &csi.NodeServiceCapability_RPC{
388+
Type: csi.NodeServiceCapability_RPC_SINGLE_NODE_MULTI_WRITER,
389+
},
390+
},
391+
},
385392
}
386393
if hp.config.EnableVolumeExpansion {
387394
caps = append(caps, &csi.NodeServiceCapability{

0 commit comments

Comments
 (0)