Merge BV CSI driver and FSS CSI driver into one container

Fix logger without value

JIRA: OKE-18386 Merge BV CSI driver and FSS CSI driver into one container

JIRA: OKE-18386 Merge BV CSI driver and FSS CSI driver into one container

Author: mrunalpagnis

cmd/oci-csi-controller-driver/csi-controller-driver/oci-csi-controller-driver.go

@@ -27,7 +27,8 @@ func StartControllerDriver(csiOptions csioptions.CSIOptions) {
 	logger := logging.Logger().Sugar()
 	logger.Sync()
 
-	drv, err := driver.NewControllerDriver(logger, csiOptions.Endpoint, csiOptions.Kubeconfig, csiOptions.Master)
+	drv, err := driver.NewControllerDriver(logger.Named("BV"), csiOptions.Endpoint, csiOptions.Kubeconfig, csiOptions.Master,
+		true, driver.BlockVolumeDriverName, driver.BlockVolumeDriverVersion)
 	if err != nil {
 		logger.With(zap.Error(err)).Fatal("Failed to create controller driver.")
 	}

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

@@ -18,24 +18,57 @@ import (
 	"flag"
 	"github.com/oracle/oci-cloud-controller-manager/cmd/oci-csi-node-driver/nodedriver"
 	"github.com/oracle/oci-cloud-controller-manager/cmd/oci-csi-node-driver/nodedriveroptions"
+	"github.com/oracle/oci-cloud-controller-manager/cmd/oci-csi-node-driver/nodedriverregistrar"
+	"github.com/oracle/oci-cloud-controller-manager/pkg/csi/driver"
 	"github.com/oracle/oci-cloud-controller-manager/pkg/util/signals"
 	"k8s.io/klog"
 )
 
 func main() {
 	nodecsioptions := nodedriveroptions.NodeCSIOptions{}
 
-	flag.StringVar(&nodecsioptions.Endpoint, "endpoint", "unix://tmp/csi.sock", "CSI endpoint")
+	flag.StringVar(&nodecsioptions.Endpoint, "endpoint", "unix://tmp/csi.sock", "Block Volume CSI endpoint")
 	flag.StringVar(&nodecsioptions.NodeID, "nodeid", "", "node id")
 	flag.StringVar(&nodecsioptions.LogLevel, "loglevel", "info", "log level")
 	flag.StringVar(&nodecsioptions.Master, "master", "", "kube master")
 	flag.StringVar(&nodecsioptions.Kubeconfig, "kubeconfig", "", "cluster kubeconfig")
+	flag.DurationVar(&nodecsioptions.ConnectionTimeout, "connection-timeout", 0, "The --connection-timeout flag is deprecated")
+	flag.StringVar(&nodecsioptions.CsiAddress, "csi-address", "/run/csi/socket", "Path of the Block Volume CSI driver socket that the node-driver-registrar will connect to.")
+	flag.StringVar(&nodecsioptions.KubeletRegistrationPath, "kubelet-registration-path", "", "Path of the Block Volume CSI driver socket on the Kubernetes host machine.")
+	flag.StringVar(&nodecsioptions.FssEndpoint, "fss-endpoint", "unix://tmp/fss/csi.sock", "FSS CSI endpoint")
+	flag.StringVar(&nodecsioptions.FssCsiAddress, "fss-csi-address", "/run/fss/socket", "Path of the FSS CSI driver socket that the node-driver-registrar will connect to.")
+	flag.StringVar(&nodecsioptions.FssKubeletRegistrationPath, "fss-kubelet-registration-path", "", "Path of the FSS CSI driver socket on the Kubernetes host machine.")
+	flag.BoolVar(&nodecsioptions.EnableFssDriver, "fss-csi-driver-enabled", false, "Handle flag to enable FSS CSI driver")
 
 	klog.InitFlags(nil)
 	flag.Set("logtostderr", "true")
 	flag.Parse()
-	stopCh := signals.SetupSignalHandler()
 
-	go nodedriver.RunNodeDriver(nodecsioptions, stopCh)
+	blockvolumeNodeOptions := nodedriveroptions.NodeOptions{
+		Name:                   "BV",
+		Endpoint:               nodecsioptions.Endpoint,
+		NodeID:                 nodecsioptions.NodeID,
+		Kubeconfig:             nodecsioptions.Kubeconfig,
+		Master:                 nodecsioptions.Master,
+		DriverName:             driver.BlockVolumeDriverName,
+		DriverVersion:          driver.BlockVolumeDriverVersion,
+		EnableControllerServer: false,
+	}
+	fssNodeOptions := nodedriveroptions.NodeOptions{
+		Name:                   "FSS",
+		Endpoint:               nodecsioptions.FssEndpoint,
+		NodeID:                 nodecsioptions.NodeID,
+		Kubeconfig:             nodecsioptions.Kubeconfig,
+		Master:                 nodecsioptions.Master,
+		DriverName:             driver.FSSDriverName,
+		DriverVersion:          driver.FSSDriverVersion,
+		EnableControllerServer: false,
+	}
+
+	stopCh := signals.SetupSignalHandler()
+	go nodedriver.RunNodeDriver(blockvolumeNodeOptions, stopCh)
+	if nodecsioptions.EnableFssDriver {
+		go nodedriver.RunNodeDriver(fssNodeOptions, stopCh)
+	}
 	<-stopCh
 }

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

@@ -22,20 +22,19 @@ import (
 )
 
 //RunNodeDriver main function to start node driver
-func RunNodeDriver(nodecsioptions nodedriveroptions.NodeCSIOptions, stopCh <-chan struct{}) error {
+func RunNodeDriver(nodeOptions nodedriveroptions.NodeOptions, stopCh <-chan struct{}) error {
 	logger := logging.Logger().Sugar()
 	logger.Sync()
 
-	drv, err := driver.NewNodeDriver(logger, nodecsioptions.Endpoint, nodecsioptions.NodeID, nodecsioptions.Kubeconfig, nodecsioptions.Master)
+	csiDriver, err := driver.NewNodeDriver(logger.Named(nodeOptions.Name), nodeOptions)
 	if err != nil {
-		logger.With(zap.Error(err)).Fatal("Failed to create Node driver.")
+		logger.With(zap.Error(err)).Fatalf("Failed to create %s Node driver.", nodeOptions.Name)
 	}
 
-	if err := drv.Run(); err != nil {
-		logger.With(zap.Error(err)).Fatal("Failed to run the CSI driver.")
+	if err := csiDriver.Run(); err != nil {
+		logger.With(zap.Error(err)).Fatalf("Failed to run the %s CSI driver.", nodeOptions.Name)
 	}
-
-	logger.Info("CSI driver exited")
+	logger.Infof("%s CSI driver exited", nodeOptions.Name)
 	<-stopCh
 	return nil
 }

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

@@ -34,3 +34,14 @@ type NodeCSIOptions struct {
 	FssKubeletRegistrationPath string
 	FssEndpoint                string
 }
+
+type NodeOptions struct {
+	Name					string
+	Endpoint				string
+	NodeID					string
+	Kubeconfig				string
+	Master					string
+	DriverName				string
+	DriverVersion			string
+	EnableControllerServer	bool
+}