From aa023ea405cb3535e5ecfc36929e625593c13916 Mon Sep 17 00:00:00 2001 From: gman Date: Wed, 7 Mar 2018 14:11:54 +0100 Subject: [PATCH] cephfs: set access mode to MULTI_NODE_MULTI_WRITER; controller (un)publish is not needed --- deploy/cephfs/kubernetes/pvc.yaml | 2 +- pkg/cephfs/cephfs.go | 3 +-- pkg/cephfs/controllerserver.go | 8 -------- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/deploy/cephfs/kubernetes/pvc.yaml b/deploy/cephfs/kubernetes/pvc.yaml index 5b7267d9e..8db355a3f 100644 --- a/deploy/cephfs/kubernetes/pvc.yaml +++ b/deploy/cephfs/kubernetes/pvc.yaml @@ -4,7 +4,7 @@ metadata: name: cephfs-pvc spec: accessModes: - - ReadWriteOnce + - ReadWriteMany resources: requests: storage: 5Gi diff --git a/pkg/cephfs/cephfs.go b/pkg/cephfs/cephfs.go index 9a4c20934..d8b0d20a2 100644 --- a/pkg/cephfs/cephfs.go +++ b/pkg/cephfs/cephfs.go @@ -85,11 +85,10 @@ func (fs *cephfsDriver) Run(driverName, nodeId, endpoint string) { fs.driver.AddControllerServiceCapabilities([]csi.ControllerServiceCapability_RPC_Type{ csi.ControllerServiceCapability_RPC_CREATE_DELETE_VOLUME, - csi.ControllerServiceCapability_RPC_PUBLISH_UNPUBLISH_VOLUME, }) fs.driver.AddVolumeCapabilityAccessModes([]csi.VolumeCapability_AccessMode_Mode{ - csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER, + csi.VolumeCapability_AccessMode_MULTI_NODE_MULTI_WRITER, }) // Create gRPC servers diff --git a/pkg/cephfs/controllerserver.go b/pkg/cephfs/controllerserver.go index a39769994..0332a4c51 100644 --- a/pkg/cephfs/controllerserver.go +++ b/pkg/cephfs/controllerserver.go @@ -148,11 +148,3 @@ func (cs *controllerServer) ValidateVolumeCapabilities(ctx context.Context, req res.Supported = true return res, nil } - -func (cs *controllerServer) ControllerPublishVolume(ctx context.Context, req *csi.ControllerPublishVolumeRequest) (*csi.ControllerPublishVolumeResponse, error) { - return &csi.ControllerPublishVolumeResponse{}, nil -} - -func (cs *controllerServer) ControllerUnpublishVolume(ctx context.Context, req *csi.ControllerUnpublishVolumeRequest) (*csi.ControllerUnpublishVolumeResponse, error) { - return &csi.ControllerUnpublishVolumeResponse{}, nil -}