Merge pull request #253 from andyzhangx/mount-utils

chore: switch to use k8s.io/mount-utils

Author: andyzhangx

go.mod

@@ -25,6 +25,7 @@ require (
 	k8s.io/client-go v0.20.0
 	k8s.io/klog/v2 v2.4.0
 	k8s.io/kubernetes v1.21.0-alpha.0.0.20201210005053-f58c4d8cd725
+	k8s.io/mount-utils v0.0.0
 	k8s.io/utils v0.0.0-20201110183641-67b214c5f920
 	sigs.k8s.io/yaml v1.2.0
 )

pkg/mounter/safe_mounter_unix.go

@@ -19,8 +19,8 @@ limitations under the License.
 package mounter
 
 import (
+	mount "k8s.io/mount-utils"
 	utilexec "k8s.io/utils/exec"
-	"k8s.io/utils/mount"
 )
 
 func NewSafeMounter() (*mount.SafeFormatAndMount, error) {

pkg/mounter/safe_mounter_windows.go

@@ -32,8 +32,8 @@ import (
 	smbclient "github.com/kubernetes-csi/csi-proxy/client/groups/smb/v1beta1"
 
 	"k8s.io/klog/v2"
+	mount "k8s.io/mount-utils"
 	utilexec "k8s.io/utils/exec"
-	"k8s.io/utils/mount"
 )
 
 var _ mount.Interface = &CSIProxyMounter{}
@@ -237,6 +237,10 @@ func (mounter *CSIProxyMounter) MountSensitive(source string, target string, fst
 	return fmt.Errorf("MountSensitive not implemented for CSIProxyMounter")
 }
 
+func (mounter *CSIProxyMounter) MountSensitiveWithoutSystemd(source string, target string, fstype string, options []string, sensitiveOptions []string) error {
+	return fmt.Errorf("MountSensitiveWithoutSystemd not implemented for CSIProxyMounter")
+}
+
 // NewCSIProxyMounter - creates a new CSI Proxy mounter struct which encompassed all the
 // clients to the CSI proxy - filesystem, disk and volume clients.
 func NewCSIProxyMounter() (*CSIProxyMounter, error) {

pkg/smb/fake_mounter.go

@@ -18,11 +18,12 @@ package smb
 
 import (
 	"fmt"
-	"github.com/kubernetes-csi/csi-driver-smb/pkg/mounter"
 	"runtime"
 	"strings"
 
-	"k8s.io/utils/mount"
+	"github.com/kubernetes-csi/csi-driver-smb/pkg/mounter"
+
+	mount "k8s.io/mount-utils"
 )
 
 type fakeMounter struct {

pkg/smb/fake_mounter_test.go

@@ -21,7 +21,7 @@ import (
 	"reflect"
 	"testing"
 
-	"k8s.io/utils/mount"
+	mount "k8s.io/mount-utils"
 )
 
 func TestMount(t *testing.T) {

pkg/smb/nodeserver_test.go

@@ -33,7 +33,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
-	"k8s.io/utils/mount"
+	mount "k8s.io/mount-utils"
 )
 
 func matchFlakyWindowsError(mainError error, substr string) bool {

pkg/smb/smb.go

@@ -22,7 +22,7 @@ import (
 	"github.com/container-storage-interface/spec/lib/go/csi"
 
 	"k8s.io/klog/v2"
-	"k8s.io/utils/mount"
+	mount "k8s.io/mount-utils"
 
 	csicommon "github.com/kubernetes-csi/csi-driver-smb/pkg/csi-common"
 	"github.com/kubernetes-csi/csi-driver-smb/pkg/mounter"

pkg/smb/smb_common_darwin.go

@@ -21,7 +21,7 @@ package smb
 import (
 	"os"
 
-	"k8s.io/utils/mount"
+	mount "k8s.io/mount-utils"
 )
 
 func Mount(m *mount.SafeFormatAndMount, source, target, fsType string, options []string, sensitiveMountOptions []string) error {

pkg/smb/smb_common_linux.go

@@ -21,7 +21,7 @@ package smb
 import (
 	"os"
 
-	"k8s.io/utils/mount"
+	mount "k8s.io/mount-utils"
 )
 
 func Mount(m *mount.SafeFormatAndMount, source, target, fsType string, options, sensitiveMountOptions []string) error {

pkg/smb/smb_common_windows.go

@@ -24,7 +24,7 @@ import (
 
 	"github.com/kubernetes-csi/csi-driver-smb/pkg/mounter"
 	"k8s.io/klog/v2"
-	"k8s.io/utils/mount"
+	mount "k8s.io/mount-utils"
 )
 
 func Mount(m *mount.SafeFormatAndMount, source, target, fsType string, mountOptions, sensitiveMountOptions []string) error {