8 files changed, 12 insertions, 30 deletions
diff --git a/pkg/driver/controllerserver.go b/pkg/driver/controllerserver.go
index 57b43d0..0d8b671 100644
--- a/pkg/driver/controllerserver.go
+++ b/pkg/driver/controllerserver.go
@@ -54,7 +54,7 @@ func (cs *ControllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
 	}
 
 	if err := filer_pb.Mkdir(cs.Driver, "/buckets", volumeId, nil); err != nil {
-		return nil, fmt.Errorf("Error setting bucket metadata: %v", err)
+		return nil, fmt.Errorf("error setting bucket metadata: %v", err)
 	}
 
 	glog.V(4).Infof("volume created %s", volumeId)
@@ -85,7 +85,7 @@ func (cs *ControllerServer) DeleteVolume(ctx context.Context, req *csi.DeleteVol
 	glog.V(4).Infof("deleting volume %s", volumeId)
 
 	if err := filer_pb.Remove(cs.Driver, "/buckets", volumeId, true, true, true, false, nil); err != nil {
-		return nil, fmt.Errorf("Error setting bucket metadata: %v", err)
+		return nil, fmt.Errorf("error setting bucket metadata: %v", err)
 	}
 
 	return &csi.DeleteVolumeResponse{}, nil
@@ -137,7 +137,7 @@ func (cs *ControllerServer) ValidateVolumeCapabilities(ctx context.Context, req
 
 	exists, err := filer_pb.Exists(cs.Driver, "/buckets", req.GetVolumeId(), true)
 	if err != nil {
-		return nil, fmt.Errorf("Error checking bucket %s exists: %v", req.GetVolumeId(), err)
+		return nil, fmt.Errorf("error checking bucket %s exists: %v", req.GetVolumeId(), err)
 	}
 	if !exists {
 		// return an error if the volume requested does not exist
diff --git a/pkg/driver/driver.go b/pkg/driver/driver.go
index 0d3af5a..4e09a93 100644
--- a/pkg/driver/driver.go
+++ b/pkg/driver/driver.go
@@ -16,12 +16,6 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
-	"k8s.io/client-go/rest"
-	"k8s.io/klog"
-)
-
-const (
-	driverName = "seaweedfs-csi-driver"
 )
 
 var (
@@ -54,16 +48,16 @@ type SeaweedFsDriver struct {
 	RunController bool
 }
 
-func NewSeaweedFsDriver(filer, nodeID, endpoint string, enableAttacher bool) *SeaweedFsDriver {
+func NewSeaweedFsDriver(name, filer, nodeID, endpoint string, enableAttacher bool) *SeaweedFsDriver {
 
-	glog.Infof("Driver: %v version: %v", driverName, version)
+	glog.Infof("Driver: %v version: %v", name, version)
 
 	util.LoadConfiguration("security", false)
 
 	n := &SeaweedFsDriver{
 		endpoint:       endpoint,
 		nodeID:         nodeID,
-		name:           driverName,
+		name:           name,
 		version:        version,
 		filers:         pb.ServerAddresses(filer).ToAddresses(),
 		grpcDialOption: security.LoadClientTLS(util.GetViper(), "grpc.client"),
@@ -92,15 +86,6 @@ func NewSeaweedFsDriver(filer, nodeID, endpoint string, enableAttacher bool) *Se
 	return n
 }
 
-func (n *SeaweedFsDriver) initClient() error {
-	_, err := rest.InClusterConfig()
-	if err != nil {
-		klog.Errorf("Failed to get cluster config with error: %v\n", err)
-		os.Exit(1)
-	}
-	return nil
-}
-
 func (n *SeaweedFsDriver) Run() {
 	glog.Info("starting")
 
@@ -120,7 +105,7 @@ func (n *SeaweedFsDriver) Run() {
 		controller,
 		node)
 
-	stopChan := make(chan os.Signal)
+	stopChan := make(chan os.Signal, 1)
 	signal.Notify(stopChan, os.Interrupt, syscall.SIGTERM, syscall.SIGHUP)
 	<-stopChan
 
diff --git a/pkg/driver/mount_util.go b/pkg/driver/mount_util.go
index 40716d0..b62a9e7 100644
--- a/pkg/driver/mount_util.go
+++ b/pkg/driver/mount_util.go
@@ -23,7 +23,7 @@ func waitForMount(path string, timeout time.Duration) error {
 		time.Sleep(interval)
 		elapsed = elapsed + interval
 		if elapsed >= timeout {
-			return errors.New("Timeout waiting for mount")
+			return errors.New("timeout waiting for mount")
 		}
 	}
 }
diff --git a/pkg/driver/mounter.go b/pkg/driver/mounter.go
index 2e51314..756f671 100644
--- a/pkg/driver/mounter.go
+++ b/pkg/driver/mounter.go
@@ -59,7 +59,7 @@ func fuseMount(path string, command string, args []string) (Unmounter, error) {
 	err := cmd.Start()
 	if err != nil {
 		glog.Errorf("running weed mount: %v", err)
-		return nil, fmt.Errorf("Error fuseMount command: %s\nargs: %s\nerror: %v", command, args, err)
+		return nil, fmt.Errorf("error fuseMount command: %s\nargs: %s\nerror: %v", command, args, err)
 	}
 
 	fu := &fuseUnmounter{
diff --git a/pkg/driver/nodeserver.go b/pkg/driver/nodeserver.go
index 7171d00..130c2a5 100644
--- a/pkg/driver/nodeserver.go
+++ b/pkg/driver/nodeserver.go
@@ -16,8 +16,7 @@ import (
 type NodeServer struct {
 	csi.UnimplementedNodeServer
 
-	Driver  *SeaweedFsDriver
-	mounter mount.Interface
+	Driver *SeaweedFsDriver
 
 	// information about the managed volumes
 	volumes       sync.Map
diff --git a/pkg/driver/server.go b/pkg/driver/server.go
index b998533..b368b92 100644
--- a/pkg/driver/server.go
+++ b/pkg/driver/server.go
@@ -40,8 +40,6 @@ func (s *nonBlockingGRPCServer) Start(endpoint string, ids csi.IdentityServer, c
 		defer s.wg.Done()
 		s.serve(endpoint, ids, cs, ns)
 	}()
-
-	return
 }
 
 func (s *nonBlockingGRPCServer) Wait() {
diff --git a/pkg/driver/utils.go b/pkg/driver/utils.go
index eee1825..24298bb 100644
--- a/pkg/driver/utils.go
+++ b/pkg/driver/utils.go
@@ -56,7 +56,7 @@ func ParseEndpoint(ep string) (string, string, error) {
 			return s[0], s[1], nil
 		}
 	}
-	return "", "", fmt.Errorf("Invalid endpoint: %v", ep)
+	return "", "", fmt.Errorf("invalid endpoint: %v", ep)
 }
 
 func logGRPC(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) {
diff --git a/pkg/driver/volume.go b/pkg/driver/volume.go
index e4e2cf3..a6d7ddb 100644
--- a/pkg/driver/volume.go
+++ b/pkg/driver/volume.go
@@ -119,7 +119,7 @@ func (vol *Volume) Unstage(stagingTargetPath string) error {
 	}
 
 	if err := vol.unmounter.Unmount(); err != nil {
-		glog.Errorf("error unmounting volume during unstage: %s, err: %v", err)
+		glog.Errorf("error unmounting volume during unstage: %s, err: %v", stagingTargetPath, err)
 		return err
 	}