From d600d0bb20e156e23d067b86b402d34b979b15fe Mon Sep 17 00:00:00 2001 From: Huamin Chen Date: Mon, 12 Mar 2018 18:31:20 +0000 Subject: [PATCH 1/3] csi 0.2.0: update nfs CSI PV example Signed-off-by: Huamin Chen --- pkg/nfs/examples/kubernetes/nginx.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/nfs/examples/kubernetes/nginx.yaml b/pkg/nfs/examples/kubernetes/nginx.yaml index b1173b32..8048e9cd 100644 --- a/pkg/nfs/examples/kubernetes/nginx.yaml +++ b/pkg/nfs/examples/kubernetes/nginx.yaml @@ -4,16 +4,17 @@ metadata: name: data-nfsplugin labels: name: data-nfsplugin - annotations: - csi.volume.kubernetes.io/volume-attributes: '{"server": "10.10.10.10", "share": "share"}' spec: accessModes: - - ReadWriteOnce + - ReadWriteMany capacity: storage: 100Gi csi: driver: csi-nfsplugin volumeHandle: data-id + volumeAttributes: + server: 127.0.0.1 + share: /export --- apiVersion: v1 kind: PersistentVolumeClaim @@ -21,7 +22,7 @@ metadata: name: data-nfsplugin spec: accessModes: - - ReadWriteOnce + - ReadWriteMany resources: requests: storage: 100Gi From 93dada2f8a20630d251d3e51782675ae29cd8b67 Mon Sep 17 00:00:00 2001 From: xing-yang Date: Tue, 13 Mar 2018 12:25:55 -0700 Subject: [PATCH 2/3] NFS plugin does not support ControllerServiceCapability Since NFS plugin does not support ControllerServiceCapability, set it to csi.ControllerServiceCapability_RPC_UNKNOWN. Also set ControllerServer to nil instead of using the default because ControllerServer is not implemented in NFS plugin. If this support is added in the future, capabilities need to be added accordingly. --- pkg/nfs/driver.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkg/nfs/driver.go b/pkg/nfs/driver.go index fbf4c9c8..4aa9ec87 100644 --- a/pkg/nfs/driver.go +++ b/pkg/nfs/driver.go @@ -51,6 +51,10 @@ func NewDriver(nodeID, endpoint string) *driver { csiDriver := csicommon.NewCSIDriver(driverName, version, nodeID) csiDriver.AddVolumeCapabilityAccessModes([]csi.VolumeCapability_AccessMode_Mode{csi.VolumeCapability_AccessMode_MULTI_NODE_MULTI_WRITER}) + // NFS plugin does not support ControllerServiceCapability now. + // If support is added, it should set to appropriate + // ControllerServiceCapability RPC types. + csiDriver.AddControllerServiceCapabilities([]csi.ControllerServiceCapability_RPC_Type{csi.ControllerServiceCapability_RPC_UNKNOWN}) d.csiDriver = csiDriver @@ -67,7 +71,8 @@ func (d *driver) Run() { s := csicommon.NewNonBlockingGRPCServer() s.Start(d.endpoint, csicommon.NewDefaultIdentityServer(d.csiDriver), - csicommon.NewDefaultControllerServer(d.csiDriver), + // NFS plugin has not implemented ControllerServer. + nil, NewNodeServer(d)) s.Wait() } From 354ff82b12ddb9e112942350ce41d175a5e411e3 Mon Sep 17 00:00:00 2001 From: Serguei Bezverkhi Date: Wed, 14 Mar 2018 08:30:34 -0400 Subject: [PATCH 3/3] fix nfs ddriver.go formating --- pkg/nfs/driver.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/nfs/driver.go b/pkg/nfs/driver.go index 4aa9ec87..72704369 100644 --- a/pkg/nfs/driver.go +++ b/pkg/nfs/driver.go @@ -54,7 +54,7 @@ func NewDriver(nodeID, endpoint string) *driver { // NFS plugin does not support ControllerServiceCapability now. // If support is added, it should set to appropriate // ControllerServiceCapability RPC types. - csiDriver.AddControllerServiceCapabilities([]csi.ControllerServiceCapability_RPC_Type{csi.ControllerServiceCapability_RPC_UNKNOWN}) + csiDriver.AddControllerServiceCapabilities([]csi.ControllerServiceCapability_RPC_Type{csi.ControllerServiceCapability_RPC_UNKNOWN}) d.csiDriver = csiDriver