Merge pull request #991 from huww98/k8s-utils-mount

remove deprecated k8s.io/utils/mount
kubernetes-sigs · Mar 6, 2024 · 1dd6eef · 1dd6eef
2 parents 6479e99 + 6b6a0e7
commit 1dd6eef
Show file tree

Hide file tree

Showing 14 changed files with 4 additions and 1,944 deletions.
diff --git a/pkg/dbfs/nodeserver.go b/pkg/dbfs/nodeserver.go
@@ -36,7 +36,7 @@ import (
 	"google.golang.org/grpc/status"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/clientcmd"
-	k8smount "k8s.io/utils/mount"
+	k8smount "k8s.io/mount-utils"
 )
 
 type nodeServer struct {

diff --git a/pkg/utils/util.go b/pkg/utils/util.go
@@ -54,7 +54,6 @@ import (
 	"k8s.io/client-go/tools/record"
 	k8smount "k8s.io/mount-utils"
 	utilexec "k8s.io/utils/exec"
-	"k8s.io/utils/mount"
 )
 
 const (
@@ -164,15 +163,12 @@ func ValidateRun(cmd string) (string, error) {
 			return "", err
 		}
 	}
-	safeMount := mount.SafeFormatAndMount{
-		Interface: mount.New(""),
-		Exec:      utilexec.New(),
-	}
+	exec := utilexec.New()
 	var command utilexec.Cmd
 	if withArgs {
-		command = safeMount.Exec.Command(name, args...)
+		command = exec.Command(name, args...)
 	} else {
-		command = safeMount.Exec.Command(name)
+		command = exec.Command(name)
 	}
 
 	stdout, err := command.CombinedOutput()

diff --git a/vendor/k8s.io/utils/mount/OWNERS b/vendor/k8s.io/utils/mount/OWNERS
diff --git a/vendor/k8s.io/utils/mount/README.md b/vendor/k8s.io/utils/mount/README.md
diff --git a/vendor/k8s.io/utils/mount/doc.go b/vendor/k8s.io/utils/mount/doc.go
diff --git a/vendor/k8s.io/utils/mount/fake_mounter.go b/vendor/k8s.io/utils/mount/fake_mounter.go