Use symlink in storage class to find correct driver

Author: Harvey Lowndes

cmd/oci/main.go

@@ -50,5 +50,10 @@ func main() {
 	log.SetOutput(f)
 
 	log.Printf("OCI FlexVolume Driver version: %s (%s)", version, build)
-	flexvolume.ExecDriver(&driver.OCIFlexvolumeDriver{}, os.Args)
+
+	drivers := map[string]flexvolume.Driver{
+		"oci-bvs": &driver.OCIFlexvolumeDriver{},
+	}
+
+	flexvolume.ExecDriver(drivers, os.Args)
 }

deploy.sh

@@ -20,7 +20,9 @@ set -o pipefail
 VENDOR=oracle
 DRIVER=oci
 
-driver_dir="/flexmnt/$VENDOR${VENDOR:+"~"}${DRIVER}"
+ORACLE_OCI_FOLDER=$VENDOR${VENDOR:+"~"}${DRIVER}
+
+driver_dir="/flexmnt/$ORACLE_OCI_FOLDER"
 
 LOG_FILE="$driver_dir/oci_flexvolume_driver.log"
 
@@ -33,9 +35,15 @@ if [ ! -d "$driver_dir" ]; then
   mkdir "$driver_dir"
 fi
 
+if [ ! -d "$driver_dir-bvs" ]; then
+  mkdir "$driver_dir-bvs"
+fi
+
 cp "/$DRIVER" "$driver_dir/.$DRIVER"
 mv -f "$driver_dir/.$DRIVER" "$driver_dir/$DRIVER"
 
+ln -sf "../$ORACLE_OCI_FOLDER/$DRIVER" "$driver_dir-bvs/$DRIVER-bvs"
+
 if [ -f "$CONFIG_FILE" ]; then
   cp  "$CONFIG_FILE"  "$driver_dir/$config_file_name"
 fi

pkg/flexvolume/flexvolume.go

@@ -20,6 +20,8 @@ import (
 	"io"
 	"log"
 	"os"
+	"path"
+	"strings"
 )
 
 // Defined to enable overriding in tests.
@@ -67,6 +69,8 @@ const (
 	OptionKeyPodUID       = "kubernetes.io/pod.uid"
 
 	OptionKeyServiceAccountName = "kubernetes.io/serviceAccount.name"
+
+	DefaultSymlinkDirectory = "oci-bvs"
 )
 
 // Driver is the main Flexvolume interface.
@@ -143,13 +147,27 @@ func processOpts(optsStr string) (Options, error) {
 
 // ExecDriver executes the appropriate FlexvolumeDriver command based on
 // recieved call-out.
-func ExecDriver(driver Driver, args []string) {
+func ExecDriver(drivers map[string]Driver, args []string) {
 	if len(args) < 2 {
 		ExitWithResult(Fail("Expected at least one argument"))
 	}
 
 	log.Printf("'%s %s' called with %s", args[0], args[1], args[2:])
 
+	driver := drivers[DefaultSymlinkDirectory] //Block volume is default
+
+	dir := path.Base(args[0])
+	dir = strings.TrimPrefix(dir, "oracle~")
+
+	if dir != "oci" && dir != DefaultSymlinkDirectory {
+		driver = drivers[dir]
+		if driver == nil {
+			ExitWithResult(Fail("No driver found for ", dir))
+		}
+	}
+
+	log.Printf("Using %s driver", dir)
+
 	switch args[1] {
 	// <driver executable> init
 	case "init":