Update dependencies, move from deprecated k8s.io/utils/mount to k8s.io/mount-utils

5 files changed, 13 insertions, 13 deletions

diff --git a/pkg/driver/mount_util.go b/pkg/driver/mount_util.go
index 561a499..d288e8c 100644
--- a/pkg/driver/mount_util.go
+++ b/pkg/driver/mount_util.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"time"
 
-	"k8s.io/utils/mount"
+	"k8s.io/mount-utils"
 )
 
 func waitForMount(path string, timeout time.Duration) error {
diff --git a/pkg/driver/mounter.go b/pkg/driver/mounter.go
index 909e6ec..34e0461 100644
--- a/pkg/driver/mounter.go
+++ b/pkg/driver/mounter.go
@@ -10,7 +10,7 @@ import (
 	"os/exec"
 
 	"github.com/seaweedfs/seaweedfs/weed/glog"
-	"k8s.io/utils/mount"
+	"k8s.io/mount-utils"
 )
 
 // Config holds values to configure the driver
diff --git a/pkg/driver/nodeserver.go b/pkg/driver/nodeserver.go
index 87fe6c5..d89919e 100644
--- a/pkg/driver/nodeserver.go
+++ b/pkg/driver/nodeserver.go
@@ -10,7 +10,7 @@ import (
 	"github.com/seaweedfs/seaweedfs/weed/glog"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
-	"k8s.io/utils/mount"
+	"k8s.io/mount-utils"
 )
 
 type NodeServer struct {
diff --git a/pkg/driver/utils.go b/pkg/driver/utils.go
index 837d5a4..ea83209 100644
--- a/pkg/driver/utils.go
+++ b/pkg/driver/utils.go
@@ -12,7 +12,7 @@ import (
 	"github.com/seaweedfs/seaweedfs/weed/glog"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
-	"k8s.io/utils/mount"
+	"k8s.io/mount-utils"
 )
 
 func NewNodeServer(n *SeaweedFsDriver) *NodeServer {
@@ -71,23 +71,23 @@ func logGRPC(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, h
 
 func checkMount(targetPath string) (bool, error) {
 	mounter := mount.New("")
-	notMnt, err := mount.IsNotMountPoint(mounter, targetPath)
+	isMnt, err := mounter.IsMountPoint(targetPath)
 	if err != nil {
 		if os.IsNotExist(err) {
 			if err = os.MkdirAll(targetPath, 0750); err != nil {
 				return false, err
 			}
-			notMnt = true
+			isMnt = false
 		} else if mount.IsCorruptedMnt(err) {
 			if err := mounter.Unmount(targetPath); err != nil {
 				return false, err
 			}
-			notMnt, err = mount.IsNotMountPoint(mounter, targetPath)
+			isMnt, err = mounter.IsMountPoint(targetPath)
 		} else {
 			return false, err
 		}
 	}
-	return notMnt, nil
+	return isMnt, nil
 }
 
 func removeDirContent(path string) error {
diff --git a/pkg/driver/volume.go b/pkg/driver/volume.go
index ff303ea..a6a8cfc 100644
--- a/pkg/driver/volume.go
+++ b/pkg/driver/volume.go
@@ -9,7 +9,7 @@ import (
 	"github.com/seaweedfs/seaweedfs/weed/pb/mount_pb"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
-	"k8s.io/utils/mount"
+	"k8s.io/mount-utils"
 )
 
 type Volume struct {
@@ -32,9 +32,9 @@ func NewVolume(volumeID string, mounter Mounter) *Volume {
 
 func (vol *Volume) Stage(stagingTargetPath string) error {
 	// check whether it can be mounted
-	if notMnt, err := checkMount(stagingTargetPath); err != nil {
+	if isMnt, err := checkMount(stagingTargetPath); err != nil {
 		return err
-	} else if !notMnt {
+	} else if isMnt {
 		// try to unmount before mounting again
 		_ = mount.New("").Unmount(stagingTargetPath)
 	}
@@ -49,9 +49,9 @@ func (vol *Volume) Stage(stagingTargetPath string) error {
 
 func (vol *Volume) Publish(stagingTargetPath string, targetPath string, readOnly bool) error {
 	// check whether it can be mounted
-	if notMnt, err := checkMount(targetPath); err != nil {
+	if isMnt, err := checkMount(targetPath); err != nil {
 		return err
-	} else if !notMnt {
+	} else if isMnt {
 		// maybe already mounted?
 		return nil
 	}