OKE-34832 - Lustre CSI Node Driver enablement

Author: dhananjay-ng

cmd/oci-csi-node-driver/main.go

@@ -16,6 +16,9 @@ package main
 
 import (
 	"flag"
+	"os"
+	"runtime"
+	"strings"
 
 	"github.com/spf13/viper"
 	"go.uber.org/zap/zapcore"
@@ -37,17 +40,18 @@ func main() {
 	flag.StringVar(&nodecsioptions.Kubeconfig, "kubeconfig", "", "cluster kubeconfig")
 	flag.StringVar(&nodecsioptions.FssEndpoint, "fss-endpoint", "unix://tmp/fss/csi.sock", "FSS CSI endpoint")
 	flag.BoolVar(&nodecsioptions.EnableFssDriver, "fss-csi-driver-enabled", true, "Handle flag to enable FSS CSI driver")
-	flag.StringVar(&nodecsioptions.LustreEndpoint, "lustre-endpoint", "unix:///var/lib/kubelet/plugins/lustre.csi.oraclecloud.com/csi.sock", "Lustre CSI endpoint")
-	flag.StringVar(&nodecsioptions.LustreCsiAddress, "lustre-csi-address", "/var/lib/kubelet/plugins/lustre.csi.oraclecloud.com/csi.sock", "Path of the Lustre CSI driver socket that the node-driver-registrar will connect to.")
+	flag.StringVar(&nodecsioptions.LustreEndpoint, "lustre-endpoint", "unix:///lustre/csi.sock", "Lustre CSI endpoint")
+	flag.StringVar(&nodecsioptions.LustreCsiAddress, "lustre-csi-address", "/lustre/csi.sock", "Path of the Lustre CSI driver socket that the node-driver-registrar will connect to.")
 	flag.StringVar(&nodecsioptions.LustreKubeletRegistrationPath, "lustre-kubelet-registration-path", "/var/lib/kubelet/plugins/lustre.csi.oraclecloud.com/csi.sock", "Path of the Lustre CSI driver socket on the Kubernetes host machine.")
-	flag.BoolVar(&nodecsioptions.OnlyEnableLustreDriver, "only-lustre-csi-driver-enabled", false, "Handle flag to enable Lustre CSI driver")
 
 	klog.InitFlags(nil)
 	flag.Set("logtostderr", "true")
 	flag.Parse()
 
 	viper.Set("log-level", getLevel(nodecsioptions.LogLevel))
 
+	enableLustreDriver := IsLustreDriverEnabled()
+
 	blockvolumeNodeOptions := nodedriveroptions.NodeOptions{
 		Name:                   "BV",
 		Endpoint:               nodecsioptions.Endpoint,
@@ -82,17 +86,20 @@ func main() {
 
 	stopCh := signals.SetupSignalHandler()
 
-	if nodecsioptions.OnlyEnableLustreDriver {
+	go nodedriver.RunNodeDriver(blockvolumeNodeOptions, stopCh)
+	if nodecsioptions.EnableFssDriver {
+		go nodedriver.RunNodeDriver(fssNodeOptions, stopCh)
+	}
+	if enableLustreDriver {
 		go nodedriver.RunNodeDriver(lustreNodeOptions, stopCh)
-	} else {
-		go nodedriver.RunNodeDriver(blockvolumeNodeOptions, stopCh)
-		if nodecsioptions.EnableFssDriver {
-			go nodedriver.RunNodeDriver(fssNodeOptions, stopCh)
-		}
 	}
 	<-stopCh
 }
 
+func IsLustreDriverEnabled() bool {
+	return strings.EqualFold(os.Getenv("LUSTRE_DRIVER_ENABLED"), "true")
+}
+
 func getLevel(loglevel string) int8 {
 	switch loglevel {
 	case "debug":

cmd/oci-csi-node-driver/main_test.go

@@ -0,0 +1,37 @@
+package main
+
+import (
+	"os"
+	"testing"
+)
+
+func Test_IsLustreDriverEnabled(t *testing.T) {
+	tests := []struct {
+		envValue string
+		expected bool
+	}{
+		{"true", true},
+		{"TRUE", true},
+		{"TrUe", true},
+		{"false", false},
+		{"", false},
+		{"random", false},
+	}
+
+	for _, tc := range tests {
+		// Set or unset the environment variable based on the test case.
+		if tc.envValue == "" {
+			os.Unsetenv("LUSTRE_DRIVER_ENABLED")
+		} else {
+			os.Setenv("LUSTRE_DRIVER_ENABLED", tc.envValue)
+		}
+
+		// Our logic under test: compare the environment variable with "true" (case-insensitive).
+		enableLustreDriver := IsLustreDriverEnabled()
+
+		if enableLustreDriver != tc.expected {
+			t.Errorf("For LUSTRE_DRIVER_ENABLED=%q, expected %v but got %v",
+				tc.envValue, tc.expected, enableLustreDriver)
+		}
+	}
+}

cmd/oci-csi-node-driver/nodedriveroptions/nodecsioptions.go

@@ -24,7 +24,6 @@ type NodeCSIOptions struct {
 
 	EnableFssDriver            bool
 	FssEndpoint                string
-	OnlyEnableLustreDriver        bool
 	LustreCsiAddress              string
 	LustreKubeletRegistrationPath string
 	LustreEndpoint                string