provide option to set pluginpath for cephfs

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
ceph · Jul 4, 2019 · 9b24524 · 9b24524
1 parent 5cf0599
commit 9b24524
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 18 deletions.
diff --git a/cmd/cephcsi.go b/cmd/cephcsi.go
@@ -20,6 +20,7 @@ import (
 	"flag"
 	"os"
 	"path"
+	"path/filepath"
 	"strings"
 
 	"github.com/ceph/ceph-csi/pkg/cephfs"
@@ -52,6 +53,8 @@ var (
 	volumeMounter   = flag.String("volumemounter", "", "default volume mounter (possible options are 'kernel', 'fuse')")
 	mountCacheDir   = flag.String("mountcachedir", "", "mount info cache save dir")
 	metadataStorage = flag.String("metadatastorage", "", "metadata persistence method [node|k8s_configmap]")
+
+	pluginFoler = flag.String("pluginpath", "/var/lib/kubelet/plugins/", "the location of cephcsi plugin")
 )
 
 func init() {
@@ -108,21 +111,20 @@ func main() {
 	klog.Infof("Starting driver type: %v with name: %v", driverType, dname)
 	switch driverType {
 	case rbdType:
-		rbd.PluginFolder += dname
 		driver := rbd.NewDriver()
 		driver.Run(dname, *nodeID, *endpoint, *instanceID, *containerized)
 
 	case cephfsType:
-		cephfs.PluginFolder += dname
+		*pluginFoler = filepath.Join(*pluginFoler, dname)
 		if *metadataStorage != "" {
 			cp, err = util.CreatePersistanceStorage(
-				cephfs.PluginFolder, *metadataStorage, dname)
+				*pluginFoler, *metadataStorage, *pluginFoler)
 			if err != nil {
 				os.Exit(1)
 			}
 		}
 		driver := cephfs.NewDriver()
-		driver.Run(dname, *nodeID, *endpoint, *volumeMounter, *mountCacheDir, *instanceID, cp)
+		driver.Run(dname, *nodeID, *endpoint, *volumeMounter, *mountCacheDir, *instanceID, *pluginFoler, cp)
 
 	default:
 		klog.Fatalln("invalid volume type", vtype) // calls exit

diff --git a/pkg/cephfs/driver.go b/pkg/cephfs/driver.go
@@ -40,7 +40,7 @@ const (
 )
 
 // PluginFolder defines the location of ceph plugin
-var PluginFolder = "/var/lib/kubelet/plugins/"
+var PluginFolder = ""
 
 // Driver contains the default identity,node and controller struct
 type Driver struct {
@@ -93,10 +93,11 @@ func NewNodeServer(d *csicommon.CSIDriver) *NodeServer {
 
 // Run start a non-blocking grpc controller,node and identityserver for
 // ceph CSI driver which can serve multiple parallel requests
-func (fs *Driver) Run(driverName, nodeID, endpoint, volumeMounter, mountCacheDir, instanceID string, cachePersister util.CachePersister) {
+func (fs *Driver) Run(driverName, nodeID, endpoint, volumeMounter, mountCacheDir, instanceID, pluginFolder string, cachePersister util.CachePersister) {
 	klog.Infof("Driver: %v version: %v", driverName, version)
 
 	// Configuration
+	PluginFolder = pluginFolder
 
 	if err := loadAvailableMounters(); err != nil {
 		klog.Fatalf("cephfs: failed to load ceph mounters: %v", err)

diff --git a/pkg/rbd/rbd.go b/pkg/rbd/rbd.go
@@ -48,9 +48,6 @@ type Driver struct {
 var (
 	version = "1.0.0"
 
-	// PluginFolder defines the location of ceph plugin
-	PluginFolder = "/var/lib/kubelet/plugins/"
-
 	// CSIInstanceID is the instance ID that is unique to an instance of CSI, used when sharing
 	// ceph clusters across CSI instances, to differentiate omap names per CSI instance
 	CSIInstanceID = "default"

diff --git a/pkg/util/cachepersister.go b/pkg/util/cachepersister.go
@@ -22,11 +22,6 @@ import (
 	"k8s.io/klog"
 )
 
-const (
-	// PluginFolder defines location of plugins
-	PluginFolder = "/var/lib/kubelet/plugins"
-)
-
 // ForAllFunc is a unary predicate for visiting all cache entries
 // matching the `pattern' in CachePersister's ForAll function.
 type ForAllFunc func(identifier string) error
@@ -45,7 +40,7 @@ type CachePersister interface {
 }
 
 // NewCachePersister returns CachePersister based on store
-func NewCachePersister(metadataStore, driverName string) (CachePersister, error) {
+func NewCachePersister(metadataStore, pluginFolder string) (CachePersister, error) {
 	if metadataStore == "k8s_configmap" {
 		klog.Infof("cache-perister: using kubernetes configmap as metadata cache persister")
 		k8scm := &K8sCMCache{}
@@ -55,7 +50,7 @@ func NewCachePersister(metadataStore, driverName string) (CachePersister, error)
 	} else if metadataStore == "node" {
 		klog.Infof("cache-persister: using node as metadata cache persister")
 		nc := &NodeCache{}
-		nc.BasePath = PluginFolder + "/" + driverName
+		nc.BasePath = pluginFolder
 		nc.CacheDir = "controller"
 		return nc, nil
 	}

diff --git a/pkg/util/util.go b/pkg/util/util.go
@@ -48,7 +48,7 @@ func roundUpSize(volumeSizeBytes, allocationUnitBytes int64) int64 {
 }
 
 // CreatePersistanceStorage creates storage path and initializes new cache
-func CreatePersistanceStorage(sPath, metaDataStore, driverName string) (CachePersister, error) {
+func CreatePersistanceStorage(sPath, metaDataStore, pluginPath string) (CachePersister, error) {
 	var err error
 	if err = createPersistentStorage(path.Join(sPath, "controller")); err != nil {
 		klog.Errorf("failed to create persistent storage for controller: %v", err)
@@ -60,7 +60,7 @@ func CreatePersistanceStorage(sPath, metaDataStore, driverName string) (CachePer
 		return nil, err
 	}
 
-	cp, err := NewCachePersister(metaDataStore, driverName)
+	cp, err := NewCachePersister(metaDataStore, pluginPath)
 	if err != nil {
 		klog.Errorf("failed to define cache persistence method: %v", err)
 		return nil, err