Merge pull request #389 from andyzhangx/mount-utils

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

Author: andyzhangx

deploy/blobfuse-proxy/blobfuse-proxy.yaml

@@ -44,7 +44,7 @@ spec:
             apt-get update
             apt-get install -y blobfuse=1.3.6
             # download blobfuse-proxy .deb package
-            wget https://github.com/boddumanohar/blob-csi-driver/raw/blobfuse-proxy-ds/deploy/blobfuse-proxy/v0.1.0/blobfuse-proxy-v0.1.0.deb -O /tmp/blobfuse-proxy-v0.1.0.deb
+            wget https://github.com/kubernetes-sigs/blob-csi-driver/raw/master/deploy/blobfuse-proxy/v0.1.0/blobfuse-proxy-v0.1.0.deb -O /tmp/blobfuse-proxy-v0.1.0.deb
             dpkg -i /tmp/blobfuse-proxy-v0.1.0.deb
             mkdir -p /var/lib/kubelet/plugins/blob.csi.azure.com
             echo "Enabling blobfuse proxy systemctl service"

go.mod

@@ -25,6 +25,7 @@ require (
 	k8s.io/component-base 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/cloud-provider-azure v0.0.0
 	sigs.k8s.io/yaml v1.2.0

pkg/blob/blob.go

@@ -31,8 +31,8 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/klog/v2"
 	k8sutil "k8s.io/kubernetes/pkg/volume/util"
+	mount "k8s.io/mount-utils"
 	utilexec "k8s.io/utils/exec"
-	"k8s.io/utils/mount"
 
 	csicommon "sigs.k8s.io/blob-csi-driver/pkg/csi-common"
 	"sigs.k8s.io/blob-csi-driver/pkg/util"

pkg/blob/fake_mount.go

@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"strings"
 
-	"k8s.io/utils/mount"
+	mount "k8s.io/mount-utils"
 )
 
 type fakeMounter struct {

pkg/blob/fake_mount_test.go

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

pkg/blob/nodeserver.go

@@ -32,7 +32,7 @@ import (
 	"k8s.io/klog/v2"
 	"k8s.io/kubernetes/pkg/volume"
 	"k8s.io/kubernetes/pkg/volume/util"
-	"k8s.io/utils/mount"
+	mount "k8s.io/mount-utils"
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

pkg/blob/nodeserver_test.go

@@ -33,8 +33,8 @@ import (
 	"github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/stretchr/testify/assert"
 
+	mount "k8s.io/mount-utils"
 	testingexec "k8s.io/utils/exec/testing"
-	"k8s.io/utils/mount"
 )
 
 const (