Allow static persistent volumes, some code cleanup

1 files changed, 11 insertions, 5 deletions

diff --git a/pkg/driver/nodeserver.go b/pkg/driver/nodeserver.go
index 71f40ba..8d2277a 100644
--- a/pkg/driver/nodeserver.go
+++ b/pkg/driver/nodeserver.go
@@ -2,6 +2,7 @@ package driver
 
 import (
 	"context"
+	"fmt"
 	"os"
 	"strings"
 
@@ -50,14 +51,19 @@ func (ns *NodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublis
 		return &csi.NodePublishVolumeResponse{}, nil
 	}
 
-	mo := req.GetVolumeCapability().GetMount().GetMountFlags()
-	if req.GetReadonly() {
-		mo = append(mo, "ro")
+	volContext := req.GetVolumeContext()
+
+	path, ok := volContext["path"]
+	if !ok {
+		path = fmt.Sprintf("/buckets/%s", volumeID)
 	}
 
-	volContext := req.GetVolumeContext()
+	collection, ok := volContext["collection"]
+	if !ok {
+		collection = volumeID
+	}
 
-	mounter, err := newMounter(volumeID, ns.Driver, volContext)
+	mounter, err := newMounter(path, collection, req.GetReadonly(), ns.Driver, volContext)
 	if err != nil {
 		return nil, err
 	}