Add --drivername option for alternative driver deployments

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

@@ -2,7 +2,7 @@
 apiVersion: storage.k8s.io/v1beta1
 kind: CSIDriver
 metadata:
-  name: smb.csi.k8s.io
+  name: {{ .Values.driver.name }}
 spec:
   attachRequired: false
   podInfoOnMount: true

charts/latest/csi-driver-smb/templates/csi-smb-node-windows.yaml

@@ -49,7 +49,7 @@ spec:
           args:
             - --v=2
             - --csi-address=$(CSI_ENDPOINT)
-            - --kubelet-registration-path={{ .Values.kubelet.windowsPath }}\\plugins\\smb.csi.k8s.io\\csi.sock
+            - --kubelet-registration-path={{ .Values.kubelet.windowsPath }}\\plugins\\{{ .Values.driver.name }}\\csi.sock
           env:
             - name: CSI_ENDPOINT
               value: unix://C:\\csi\\csi.sock
@@ -75,6 +75,7 @@ spec:
           imagePullPolicy: {{ .Values.image.smb.pullPolicy }}
           args:
             - "--v={{ .Values.node.logLevel }}"
+            - "--drivername={{ .Values.driver.name }}"
             - --endpoint=$(CSI_ENDPOINT)
             - --nodeid=$(KUBE_NODE_NAME)
             - "--metrics-address=0.0.0.0:{{ .Values.node.metricsPort }}"
@@ -136,6 +137,6 @@ spec:
             type: Directory
         - name: plugin-dir
           hostPath:
-            path: {{ .Values.kubelet.windowsPath }}\plugins\smb.csi.k8s.io\
+            path: {{ .Values.kubelet.windowsPath }}\plugins\{{ .Values.driver.name }}\
             type: DirectoryOrCreate
 {{- end -}}

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

@@ -50,12 +50,12 @@ spec:
           lifecycle:
             preStop:
               exec:
-                command: ["/bin/sh", "-c", "rm -rf /registration/smb.csi.k8s.io-reg.sock /csi/csi.sock"]
+                command: ["/bin/sh", "-c", "rm -rf /registration/{{ .Values.driver.name }}-reg.sock /csi/csi.sock"]
           env:
             - name: ADDRESS
               value: /csi/csi.sock
             - name: DRIVER_REG_SOCK_PATH
-              value: {{ .Values.kubelet.linuxPath }}/plugins/smb.csi.k8s.io/csi.sock
+              value: {{ .Values.kubelet.linuxPath }}/plugins/{{ .Values.driver.name }}/csi.sock
           imagePullPolicy: {{ .Values.image.nodeDriverRegistrar.pullPolicy }}
           volumeMounts:
             - name: socket-dir
@@ -74,6 +74,7 @@ spec:
           imagePullPolicy: {{ .Values.image.smb.pullPolicy }}
           args:
             - "--v={{ .Values.node.logLevel }}"
+            - "--drivername={{ .Values.driver.name }}"
             - "--endpoint=$(CSI_ENDPOINT)"
             - "--nodeid=$(KUBE_NODE_NAME)"
             - "--metrics-address=0.0.0.0:{{ .Values.node.metricsPort }}"
@@ -117,7 +118,7 @@ spec:
               memory: 20Mi
       volumes:
         - hostPath:
-            path: {{ .Values.kubelet.linuxPath }}/plugins/smb.csi.k8s.io
+            path: {{ .Values.kubelet.linuxPath }}/plugins/{{ .Values.driver.name }}
             type: DirectoryOrCreate
           name: socket-dir
         - hostPath:

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

@@ -22,6 +22,9 @@ serviceAccount:
 rbac:
   create: true
 
+driver:
+  name: smb.csi.k8s.io
+
 controller:
   replicas: 2
   metricsPort: 29644

pkg/smb/smb.go

@@ -29,7 +29,7 @@ import (
 )
 
 const (
-	DriverName        = "smb.csi.k8s.io"
+	DefaultDriverName = "smb.csi.k8s.io"
 	createSubDirField = "createsubdir"
 )
 
@@ -44,9 +44,9 @@ 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 string) *Driver {
+func NewDriver(nodeID, driverName string) *Driver {
 	driver := Driver{}
-	driver.Name = DriverName
+	driver.Name = driverName
 	driver.Version = driverVersion
 	driver.NodeID = nodeID
 	driver.volumeLocks = newVolumeLocks()

pkg/smb/smb_test.go

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

pkg/smb/version.go

@@ -45,7 +45,7 @@ type VersionInfo struct {
 // GetVersion returns the version information of the driver
 func GetVersion() VersionInfo {
 	return VersionInfo{
-		DriverName:    DriverName,
+		DriverName:    DefaultDriverName,
 		DriverVersion: driverVersion,
 		GitCommit:     gitCommit,
 		BuildDate:     buildDate,

pkg/smb/version_test.go

@@ -30,7 +30,7 @@ func TestGetVersion(t *testing.T) {
 	version := GetVersion()
 
 	expected := VersionInfo{
-		DriverName:    DriverName,
+		DriverName:    DefaultDriverName,
 		DriverVersion: "N/A",
 		GitCommit:     "N/A",
 		BuildDate:     "N/A",

pkg/smbplugin/main.go

@@ -38,6 +38,7 @@ func init() {
 var (
 	endpoint       = flag.String("endpoint", "unix://tmp/csi.sock", "CSI endpoint")
 	nodeID         = flag.String("nodeid", "", "node id")
+	driverName     = flag.String("drivername", smb.DefaultDriverName, "name of the driver")
 	version        = flag.Bool("version", false, "Print the version and exit.")
 	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.")
@@ -63,7 +64,7 @@ func main() {
 }
 
 func handle() {
-	driver := smb.NewDriver(*nodeID)
+	driver := smb.NewDriver(*nodeID, *driverName)
 	if driver == nil {
 		klog.Fatalln("Failed to initialize smb CSI Driver")
 	}

test/e2e/driver/smb_driver.go

@@ -42,7 +42,7 @@ type SMBDriver struct {
 func InitSMBDriver() PVTestDriver {
 	driverName := os.Getenv(SMBDriverNameVar)
 	if driverName == "" {
-		driverName = smb.DriverName
+		driverName = smb.DefaultDriverName
 	}
 
 	klog.Infof("Using smb driver: %s", driverName)

test/e2e/suite_test.go

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