aboutsummaryrefslogtreecommitdiff
path: root/pkg/driver/utils.go
diff options
context:
space:
mode:
authorViktor Kuzmin <kvaster@gmail.com>2023-08-06 15:06:41 +0300
committerViktor Kuzmin <kvaster@gmail.com>2023-08-06 15:06:41 +0300
commitcb920765f5d0b3b7a6a54b9bacf5e9be28b46102 (patch)
tree3e82015adace22fdcdcb0b62d04a7c4c4398a8d6 /pkg/driver/utils.go
parentd777b8750bb2dd33948988f4eec8813e6207a0cd (diff)
downloadseaweedfs-csi-driver-cb920765f5d0b3b7a6a54b9bacf5e9be28b46102.tar.xz
seaweedfs-csi-driver-cb920765f5d0b3b7a6a54b9bacf5e9be28b46102.zip
Update dependencies, move from deprecated k8s.io/utils/mount to k8s.io/mount-utils
Diffstat (limited to 'pkg/driver/utils.go')
-rw-r--r--pkg/driver/utils.go10
1 files changed, 5 insertions, 5 deletions
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 {