Merge pull request #403 from andyzhangx/workingMountDir

feat: add workingMountDir in chart config

Author: andyzhangx

charts/README.md

@@ -64,6 +64,7 @@ The following table lists the configurable parameters of the latest SMB CSI Driv
 | `controller.metricsPort`                          | metrics port of csi-smb-controller                   |`29644`                                               |
 | `controller.livenessProbe.healthPort `            | health check port for liveness probe                   | `29642` |
 | `controller.logLevel`                             | controller driver log level                                                          |`5`                                                           |
+| `controller.workingMountDir`                      | working directory for provisioner to mount smb shares temporarily                  | `/tmp`                                                             |
 | `controller.runOnMaster`                          | run controller on master node                              | `false`                                                             |
 | `node.livenessProbe.healthPort `                  | health check port for liveness probe                   | `29643` |
 | `controller.resources.csiProvisioner.limits.memory`   | csi-provisioner memory limits                         | `100Mi`                                                          |

charts/latest/csi-driver-smb-v1.5.0.tgz

@@ -89,6 +89,7 @@ spec:
             - "--endpoint=$(CSI_ENDPOINT)"
             - "--metrics-address=0.0.0.0:{{ .Values.controller.metricsPort }}"
             - "--drivername={{ .Values.driver.name }}"
+            - "--working-mount-dir={{ .Values.controller.workingMountDir }}"
           ports:
             - containerPort: {{ .Values.controller.livenessProbe.healthPort }}
               name: healthz

charts/latest/csi-driver-smb/templates/csi-smb-controller.yaml

@@ -39,6 +39,7 @@ controller:
     healthPort: 29642
   runOnMaster: false
   logLevel: 5
+  workingMountDir: "/tmp"
   resources:
     csiProvisioner:
       limits:

charts/latest/csi-driver-smb/values.yaml

@@ -235,10 +235,6 @@ func getVolumeIDFromSmbVol(vol *smbVolume) string {
 
 // Get working directory for CreateVolume and DeleteVolume
 func (d *Driver) getInternalMountPath(vol *smbVolume) string {
-	// use default if empty
-	if d.workingMountDir == "" {
-		d.workingMountDir = "/tmp"
-	}
 	return filepath.Join(d.workingMountDir, vol.subDir)
 }
 

pkg/smb/controllerserver.go

@@ -39,6 +39,14 @@ const (
 	defaultDomainName = "AZURE"
 )
 
+// DriverOptions defines driver parameters specified in driver deployment
+type DriverOptions struct {
+	NodeID               string
+	DriverName           string
+	EnableGetVolumeStats bool
+	WorkingMountDir      string
+}
+
 // Driver implements all interfaces of CSI drivers
 type Driver struct {
 	csicommon.CSIDriver
@@ -52,12 +60,13 @@ type Driver struct {
 
 // NewDriver Creates a NewCSIDriver object. Assumes vendor version is equal to driver version &
 // does not support optional driver plugin info manifest field. Refer to CSI spec for more details.
-func NewDriver(nodeID, driverName string, enableGetVolumeStats bool) *Driver {
+func NewDriver(options *DriverOptions) *Driver {
 	driver := Driver{}
-	driver.Name = driverName
+	driver.Name = options.DriverName
 	driver.Version = driverVersion
-	driver.NodeID = nodeID
-	driver.enableGetVolumeStats = enableGetVolumeStats
+	driver.NodeID = options.NodeID
+	driver.enableGetVolumeStats = options.EnableGetVolumeStats
+	driver.workingMountDir = options.WorkingMountDir
 	driver.volumeLocks = newVolumeLocks()
 	return &driver
 }

pkg/smb/smb.go

@@ -30,12 +30,21 @@ const (
 )
 
 func NewFakeDriver() *Driver {
-	return NewDriver(fakeNodeID, DefaultDriverName, true)
+	options := DriverOptions{
+		NodeID:               fakeNodeID,
+		DriverName:           DefaultDriverName,
+		EnableGetVolumeStats: true,
+	}
+	return NewDriver(&options)
 }
 
 func TestNewFakeDriver(t *testing.T) {
-	// Test New fake driver.
-	d := NewDriver(fakeNodeID, DefaultDriverName, true)
+	options := DriverOptions{
+		NodeID:               fakeNodeID,
+		DriverName:           DefaultDriverName,
+		EnableGetVolumeStats: true,
+	}
+	d := NewDriver(&options)
 	assert.NotNil(t, d)
 }
 

pkg/smb/smb_test.go

@@ -43,6 +43,7 @@ var (
 	metricsAddress       = flag.String("metrics-address", "0.0.0.0:29644", "export the metrics")
 	kubeconfig           = flag.String("kubeconfig", "", "Absolute path to the kubeconfig file. Required only when running out of cluster.")
 	enableGetVolumeStats = flag.Bool("enable-get-volume-stats", false, "allow GET_VOLUME_STATS on agent node")
+	workingMountDir      = flag.String("working-mount-dir", "/tmp", "working directory for provisioner to mount smb shares temporarily")
 )
 
 func main() {
@@ -65,10 +66,13 @@ func main() {
 }
 
 func handle() {
-	driver := smb.NewDriver(*nodeID, *driverName, *enableGetVolumeStats)
-	if driver == nil {
-		klog.Fatalln("Failed to initialize smb CSI Driver")
+	driverOptions := smb.DriverOptions{
+		NodeID:               *nodeID,
+		DriverName:           *driverName,
+		EnableGetVolumeStats: *enableGetVolumeStats,
+		WorkingMountDir:      *workingMountDir,
 	}
+	driver := smb.NewDriver(&driverOptions)
 	driver.Run(*endpoint, *kubeconfig, false)
 }
 

pkg/smbplugin/main.go

@@ -113,7 +113,12 @@ var _ = ginkgo.BeforeSuite(func() {
 
 		nodeid := os.Getenv("nodeid")
 		kubeconfig := os.Getenv(kubeconfigEnvVar)
-		smbDriver = smb.NewDriver(nodeid, smb.DefaultDriverName, false)
+		options := smb.DriverOptions{
+			NodeID:               nodeid,
+			DriverName:           smb.DefaultDriverName,
+			EnableGetVolumeStats: false,
+		}
+		smbDriver = smb.NewDriver(&options)
 		go func() {
 			smbDriver.Run(fmt.Sprintf("unix:///tmp/csi-%s.sock", uuid.NewUUID().String()), kubeconfig, false)
 		}()