Remove pkg/util/mount (moved out of tree)

This patch removes pkg/util/mount completely, and replaces it with the
mount package now located at k8s.io/utils/mount. The code found at
k8s.io/utils/mount was moved there from pkg/util/mount, so the code is
identical, just no longer in-tree to k/k.

cmd/kube-proxy/app/BUILD

@@ -40,7 +40,6 @@ go_library(
         "//pkg/util/ipset:go_default_library",
         "//pkg/util/iptables:go_default_library",
         "//pkg/util/ipvs:go_default_library",
-        "//pkg/util/mount:go_default_library",
         "//pkg/util/oom:go_default_library",
         "//pkg/util/sysctl:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
@@ -75,6 +74,7 @@ go_library(
         "//vendor/github.com/spf13/pflag:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
         "//vendor/k8s.io/utils/exec:go_default_library",
+        "//vendor/k8s.io/utils/mount:go_default_library",
         "//vendor/k8s.io/utils/pointer:go_default_library",
     ] + select({
         "@io_bazel_rules_go//go/platform:android": [

cmd/kube-proxy/app/conntrack.go

@@ -23,8 +23,8 @@ import (
 	"strings"
 
 	"k8s.io/klog"
+	"k8s.io/utils/mount"
 
-	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/util/sysctl"
 )
 

cmd/kubelet/app/BUILD

@@ -74,7 +74,6 @@ go_library(
         "//pkg/util/filesystem:go_default_library",
         "//pkg/util/flag:go_default_library",
         "//pkg/util/flock:go_default_library",
-        "//pkg/util/mount:go_default_library",
         "//pkg/util/node:go_default_library",
         "//pkg/util/oom:go_default_library",
         "//pkg/util/rlimit:go_default_library",
@@ -149,6 +148,7 @@ go_library(
         "//vendor/github.com/spf13/pflag:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
         "//vendor/k8s.io/utils/exec:go_default_library",
+        "//vendor/k8s.io/utils/mount:go_default_library",
     ] + select({
         "@io_bazel_rules_go//go/platform:android": [
             "//vendor/k8s.io/utils/inotify:go_default_library",

cmd/kubelet/app/server.go

@@ -36,6 +36,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"k8s.io/klog"
+	"k8s.io/utils/mount"
 
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
@@ -95,7 +96,6 @@ import (
 	utilfs "k8s.io/kubernetes/pkg/util/filesystem"
 	utilflag "k8s.io/kubernetes/pkg/util/flag"
 	"k8s.io/kubernetes/pkg/util/flock"
-	"k8s.io/kubernetes/pkg/util/mount"
 	nodeutil "k8s.io/kubernetes/pkg/util/node"
 	"k8s.io/kubernetes/pkg/util/oom"
 	"k8s.io/kubernetes/pkg/util/rlimit"

go.mod

@@ -163,7 +163,7 @@ require (
 	k8s.io/repo-infra v0.0.1-alpha.1
 	k8s.io/sample-apiserver v0.0.0
 	k8s.io/system-validators v1.0.4
-	k8s.io/utils v0.0.0-20191030222137-2b95a09bc58d
+	k8s.io/utils v0.0.0-20191114184206-e782cd3c129f
 	sigs.k8s.io/kustomize v2.0.3+incompatible
 	sigs.k8s.io/yaml v1.1.0
 )
@@ -550,7 +550,7 @@ replace (
 	k8s.io/sample-cli-plugin => ./staging/src/k8s.io/sample-cli-plugin
 	k8s.io/sample-controller => ./staging/src/k8s.io/sample-controller
 	k8s.io/system-validators => k8s.io/system-validators v1.0.4
-	k8s.io/utils => k8s.io/utils v0.0.0-20191030222137-2b95a09bc58d
+	k8s.io/utils => k8s.io/utils v0.0.0-20191114184206-e782cd3c129f
 	modernc.org/cc => modernc.org/cc v1.0.0
 	modernc.org/golex => modernc.org/golex v1.0.0
 	modernc.org/mathutil => modernc.org/mathutil v1.0.0

go.sum

@@ -589,8 +589,8 @@ k8s.io/repo-infra v0.0.1-alpha.1 h1:2us1n30u3cOcoPsacNfCvCssS9B9Yldr1ZGOdK0728U=
 k8s.io/repo-infra v0.0.1-alpha.1/go.mod h1:wO1t9WaB99V80ljbeENTnayuEEwNZt7gECYh/CEyOJ8=
 k8s.io/system-validators v1.0.4 h1:sW57tJ/ciqOVbbTLN+ZNy64MJMNqUuiwrirQv8IR2Kw=
 k8s.io/system-validators v1.0.4/go.mod h1:HgSgTg4NAGNoYYjKsUyk52gdNi2PVDswQ9Iyn66R7NI=
-k8s.io/utils v0.0.0-20191030222137-2b95a09bc58d h1:1P0iBJsBzxRmR+dIFnM+Iu4aLxnoa7lBqozW/0uHbT8=
+k8s.io/utils v0.0.0-20191114184206-e782cd3c129f h1:GiPwtSzdP43eI1hpPCbROQCCIgCuiMMNF8YUVLF3vJo=
-k8s.io/utils v0.0.0-20191030222137-2b95a09bc58d/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
+k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
 modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=
 modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
 modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=

hack/.golint_failures

@@ -222,7 +222,6 @@ pkg/util/goroutinemap/exponentialbackoff
 pkg/util/iptables
 pkg/util/iptables/testing
 pkg/util/labels # See previous effort in PR #80685
-pkg/util/mount
 pkg/util/oom
 pkg/util/procfs
 pkg/util/removeall

hack/.staticcheck_failures

@@ -40,7 +40,6 @@ pkg/util/ebtables
 pkg/util/ipconfig
 pkg/util/iptables
 pkg/util/ipvs/testing
-pkg/util/mount
 pkg/util/netsh
 pkg/volume
 pkg/volume/awsebs

pkg/cloudprovider/providers/.import-restrictions

@@ -3,20 +3,20 @@
 		{
 			"SelectorRegexp": "k8s[.]io/utils",
 			"AllowedPrefixes": [
+				"k8s.io/utils/exec",
+				"k8s.io/utils/io",
+				"k8s.io/utils/keymutex",
+				"k8s.io/utils/mount",
 				"k8s.io/utils/net",
 				"k8s.io/utils/nsenter",
-				"k8s.io/utils/io",
-				"k8s.io/utils/strings",
-				"k8s.io/utils/exec",
 				"k8s.io/utils/path",
-				"k8s.io/utils/keymutex"
+				"k8s.io/utils/strings"
 			]
 		},
 		{
 			"SelectorRegexp": "k8s[.]io/kubernetes",
 			"AllowedPrefixes": [
-				"k8s.io/kubernetes/pkg/cloudprovider/providers",
+				"k8s.io/kubernetes/pkg/cloudprovider/providers"
-				"k8s.io/kubernetes/pkg/util/mount"
 			],
 			"ForbiddenPrefixes": []
 		}

pkg/controller/.import-restrictions

@@ -247,7 +247,6 @@
         "k8s.io/kubernetes/pkg/util/goroutinemap/exponentialbackoff",
         "k8s.io/kubernetes/pkg/util/hash",
         "k8s.io/kubernetes/pkg/util/labels",
-        "k8s.io/kubernetes/pkg/util/mount",
         "k8s.io/kubernetes/pkg/util/node",
         "k8s.io/kubernetes/pkg/util/slice",
         "k8s.io/kubernetes/pkg/util/taints",
@@ -287,14 +286,15 @@
         "k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1",
         "k8s.io/metrics/pkg/client/custom_metrics",
         "k8s.io/metrics/pkg/client/external_metrics",
-        "k8s.io/utils/nsenter",
+        "k8s.io/utils/exec",
         "k8s.io/utils/integer",
         "k8s.io/utils/io",
+        "k8s.io/utils/mount",
+        "k8s.io/utils/net",
+        "k8s.io/utils/nsenter",
         "k8s.io/utils/path",
         "k8s.io/utils/pointer",
-        "k8s.io/utils/exec",
+        "k8s.io/utils/strings"
-        "k8s.io/utils/strings",
-        "k8s.io/utils/net"
       ]
     },
     {

pkg/controller/volume/attachdetach/BUILD

@@ -18,7 +18,6 @@ go_library(
         "//pkg/controller/volume/attachdetach/statusupdater:go_default_library",
         "//pkg/controller/volume/attachdetach/util:go_default_library",
         "//pkg/features:go_default_library",
-        "//pkg/util/mount:go_default_library",
         "//pkg/volume:go_default_library",
         "//pkg/volume/csimigration:go_default_library",
         "//pkg/volume/util:go_default_library",
@@ -49,6 +48,7 @@ go_library(
         "//staging/src/k8s.io/csi-translation-lib:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
         "//vendor/k8s.io/utils/exec:go_default_library",
+        "//vendor/k8s.io/utils/mount:go_default_library",
     ],
 )
 

pkg/controller/volume/attachdetach/attach_detach_controller.go

@@ -23,6 +23,10 @@ import (
 	"net"
 	"time"
 
+	"k8s.io/klog"
+	utilexec "k8s.io/utils/exec"
+	"k8s.io/utils/mount"
+
 	authenticationv1 "k8s.io/api/authentication/v1"
 	v1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -45,9 +49,6 @@ import (
 	"k8s.io/client-go/util/workqueue"
 	cloudprovider "k8s.io/cloud-provider"
 	csitrans "k8s.io/csi-translation-lib"
-	"k8s.io/klog"
-	utilexec "k8s.io/utils/exec"
-
 	"k8s.io/kubernetes/pkg/controller/volume/attachdetach/cache"
 	"k8s.io/kubernetes/pkg/controller/volume/attachdetach/metrics"
 	"k8s.io/kubernetes/pkg/controller/volume/attachdetach/populator"
@@ -55,7 +56,6 @@ import (
 	"k8s.io/kubernetes/pkg/controller/volume/attachdetach/statusupdater"
 	"k8s.io/kubernetes/pkg/controller/volume/attachdetach/util"
 	"k8s.io/kubernetes/pkg/features"
-	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume"
 	"k8s.io/kubernetes/pkg/volume/csimigration"
 	volumeutil "k8s.io/kubernetes/pkg/volume/util"

pkg/controller/volume/expand/BUILD

@@ -9,7 +9,6 @@ go_library(
     deps = [
         "//pkg/apis/core/v1/helper:go_default_library",
         "//pkg/controller/volume/events:go_default_library",
-        "//pkg/util/mount:go_default_library",
         "//pkg/volume:go_default_library",
         "//pkg/volume/csimigration:go_default_library",
         "//pkg/volume/util:go_default_library",
@@ -35,6 +34,7 @@ go_library(
         "//staging/src/k8s.io/cloud-provider:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
         "//vendor/k8s.io/utils/exec:go_default_library",
+        "//vendor/k8s.io/utils/mount:go_default_library",
     ],
 )
 

pkg/controller/volume/expand/expand_controller.go

@@ -22,6 +22,8 @@ import (
 	"time"
 
 	"k8s.io/klog"
+	utilexec "k8s.io/utils/exec"
+	"k8s.io/utils/mount"
 
 	authenticationv1 "k8s.io/api/authentication/v1"
 	v1 "k8s.io/api/core/v1"
@@ -41,11 +43,8 @@ import (
 	"k8s.io/client-go/tools/record"
 	"k8s.io/client-go/util/workqueue"
 	cloudprovider "k8s.io/cloud-provider"
-	utilexec "k8s.io/utils/exec"
-
 	v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
 	"k8s.io/kubernetes/pkg/controller/volume/events"
-	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume"
 	"k8s.io/kubernetes/pkg/volume/csimigration"
 	"k8s.io/kubernetes/pkg/volume/util"

pkg/controller/volume/persistentvolume/BUILD

@@ -24,7 +24,6 @@ go_library(
         "//pkg/features:go_default_library",
         "//pkg/util/goroutinemap:go_default_library",
         "//pkg/util/goroutinemap/exponentialbackoff:go_default_library",
-        "//pkg/util/mount:go_default_library",
         "//pkg/volume:go_default_library",
         "//pkg/volume/csimigration:go_default_library",
         "//pkg/volume/util:go_default_library",
@@ -58,6 +57,7 @@ go_library(
         "//staging/src/k8s.io/csi-translation-lib:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
         "//vendor/k8s.io/utils/exec:go_default_library",
+        "//vendor/k8s.io/utils/mount:go_default_library",
     ],
 )
 

pkg/controller/volume/persistentvolume/volume_host.go

@@ -20,16 +20,16 @@ import (
 	"fmt"
 	"net"
 
+	"k8s.io/klog"
+	utilexec "k8s.io/utils/exec"
+	"k8s.io/utils/mount"
+
 	authenticationv1 "k8s.io/api/authentication/v1"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/record"
 	cloudprovider "k8s.io/cloud-provider"
-	"k8s.io/klog"
-	utilexec "k8s.io/utils/exec"
-
-	"k8s.io/kubernetes/pkg/util/mount"
 	vol "k8s.io/kubernetes/pkg/volume"
 	"k8s.io/kubernetes/pkg/volume/util/subpath"
 )

pkg/kubelet/BUILD

@@ -100,7 +100,6 @@ go_library(
         "//pkg/security/apparmor:go_default_library",
         "//pkg/security/podsecuritypolicy/sysctl:go_default_library",
         "//pkg/util/iptables:go_default_library",
-        "//pkg/util/mount:go_default_library",
         "//pkg/util/node:go_default_library",
         "//pkg/util/oom:go_default_library",
         "//pkg/util/removeall:go_default_library",
@@ -149,6 +148,7 @@ go_library(
         "//vendor/k8s.io/klog:go_default_library",
         "//vendor/k8s.io/utils/exec:go_default_library",
         "//vendor/k8s.io/utils/integer:go_default_library",
+        "//vendor/k8s.io/utils/mount:go_default_library",
         "//vendor/k8s.io/utils/net:go_default_library",
         "//vendor/k8s.io/utils/path:go_default_library",
     ] + select({
@@ -214,7 +214,6 @@ go_test(
         "//pkg/kubelet/util/sliceutils:go_default_library",
         "//pkg/kubelet/volumemanager:go_default_library",
         "//pkg/scheduler/nodeinfo:go_default_library",
-        "//pkg/util/mount:go_default_library",
         "//pkg/util/taints:go_default_library",
         "//pkg/volume:go_default_library",
         "//pkg/volume/awsebs:go_default_library",
@@ -256,6 +255,7 @@ go_test(
         "//vendor/github.com/google/cadvisor/info/v2:go_default_library",
         "//vendor/github.com/stretchr/testify/assert:go_default_library",
         "//vendor/github.com/stretchr/testify/require:go_default_library",
+        "//vendor/k8s.io/utils/mount:go_default_library",
     ] + select({
         "@io_bazel_rules_go//go/platform:android": [
             "//staging/src/k8s.io/cri-api/pkg/apis/runtime/v1alpha2:go_default_library",

pkg/kubelet/cm/BUILD

@@ -58,7 +58,6 @@ go_library(
             "//pkg/kubelet/qos:go_default_library",
             "//pkg/kubelet/stats/pidlimit:go_default_library",
             "//pkg/kubelet/types:go_default_library",
-            "//pkg/util/mount:go_default_library",
             "//pkg/util/oom:go_default_library",
             "//pkg/util/procfs:go_default_library",
             "//pkg/util/sysctl:go_default_library",
@@ -73,27 +72,28 @@ go_library(
             "//vendor/github.com/opencontainers/runc/libcontainer/cgroups/systemd:go_default_library",
             "//vendor/github.com/opencontainers/runc/libcontainer/configs:go_default_library",
             "//vendor/k8s.io/utils/io:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
             "//vendor/k8s.io/utils/path:go_default_library",
         ],
         "@io_bazel_rules_go//go/platform:darwin": [
             "//pkg/kubelet/cadvisor:go_default_library",
-            "//pkg/util/mount:go_default_library",
             "//staging/src/k8s.io/client-go/tools/record:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
         ],
         "@io_bazel_rules_go//go/platform:dragonfly": [
             "//pkg/kubelet/cadvisor:go_default_library",
-            "//pkg/util/mount:go_default_library",
             "//staging/src/k8s.io/client-go/tools/record:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
         ],
         "@io_bazel_rules_go//go/platform:freebsd": [
             "//pkg/kubelet/cadvisor:go_default_library",
-            "//pkg/util/mount:go_default_library",
             "//staging/src/k8s.io/client-go/tools/record:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
         ],
         "@io_bazel_rules_go//go/platform:ios": [
             "//pkg/kubelet/cadvisor:go_default_library",
-            "//pkg/util/mount:go_default_library",
             "//staging/src/k8s.io/client-go/tools/record:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
         ],
         "@io_bazel_rules_go//go/platform:linux": [
             "//pkg/api/v1/resource:go_default_library",
@@ -108,7 +108,6 @@ go_library(
             "//pkg/kubelet/qos:go_default_library",
             "//pkg/kubelet/stats/pidlimit:go_default_library",
             "//pkg/kubelet/types:go_default_library",
-            "//pkg/util/mount:go_default_library",
             "//pkg/util/oom:go_default_library",
             "//pkg/util/procfs:go_default_library",
             "//pkg/util/sysctl:go_default_library",
@@ -123,37 +122,38 @@ go_library(
             "//vendor/github.com/opencontainers/runc/libcontainer/cgroups/systemd:go_default_library",
             "//vendor/github.com/opencontainers/runc/libcontainer/configs:go_default_library",
             "//vendor/k8s.io/utils/io:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
             "//vendor/k8s.io/utils/path:go_default_library",
         ],
         "@io_bazel_rules_go//go/platform:nacl": [
             "//pkg/kubelet/cadvisor:go_default_library",
-            "//pkg/util/mount:go_default_library",
             "//staging/src/k8s.io/client-go/tools/record:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
         ],
         "@io_bazel_rules_go//go/platform:netbsd": [
             "//pkg/kubelet/cadvisor:go_default_library",
-            "//pkg/util/mount:go_default_library",
             "//staging/src/k8s.io/client-go/tools/record:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
         ],
         "@io_bazel_rules_go//go/platform:openbsd": [
             "//pkg/kubelet/cadvisor:go_default_library",
-            "//pkg/util/mount:go_default_library",
             "//staging/src/k8s.io/client-go/tools/record:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
         ],
         "@io_bazel_rules_go//go/platform:plan9": [
             "//pkg/kubelet/cadvisor:go_default_library",
-            "//pkg/util/mount:go_default_library",
             "//staging/src/k8s.io/client-go/tools/record:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
         ],
         "@io_bazel_rules_go//go/platform:solaris": [
             "//pkg/kubelet/cadvisor:go_default_library",
-            "//pkg/util/mount:go_default_library",
             "//staging/src/k8s.io/client-go/tools/record:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
         ],
         "@io_bazel_rules_go//go/platform:windows": [
             "//pkg/kubelet/cadvisor:go_default_library",
-            "//pkg/util/mount:go_default_library",
             "//staging/src/k8s.io/client-go/tools/record:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
         ],
         "//conditions:default": [],
     }),
@@ -174,7 +174,6 @@ go_test(
         "@io_bazel_rules_go//go/platform:android": [
             "//pkg/features:go_default_library",
             "//pkg/kubelet/eviction/api:go_default_library",
-            "//pkg/util/mount:go_default_library",
             "//staging/src/k8s.io/api/core/v1:go_default_library",
             "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",
             "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
@@ -182,11 +181,11 @@ go_test(
             "//staging/src/k8s.io/component-base/featuregate/testing:go_default_library",
             "//vendor/github.com/stretchr/testify/assert:go_default_library",
             "//vendor/github.com/stretchr/testify/require:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
         ],
         "@io_bazel_rules_go//go/platform:linux": [
             "//pkg/features:go_default_library",
             "//pkg/kubelet/eviction/api:go_default_library",
-            "//pkg/util/mount:go_default_library",
             "//staging/src/k8s.io/api/core/v1:go_default_library",
             "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",
             "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
@@ -194,6 +193,7 @@ go_test(
             "//staging/src/k8s.io/component-base/featuregate/testing:go_default_library",
             "//vendor/github.com/stretchr/testify/assert:go_default_library",
             "//vendor/github.com/stretchr/testify/require:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
         ],
         "//conditions:default": [],
     }),

pkg/kubelet/cm/container_manager_linux.go

@@ -33,6 +33,9 @@ import (
 	"github.com/opencontainers/runc/libcontainer/cgroups/fs"
 	"github.com/opencontainers/runc/libcontainer/configs"
 	"k8s.io/klog"
+	utilio "k8s.io/utils/io"
+	"k8s.io/utils/mount"
+	utilpath "k8s.io/utils/path"
 
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
@@ -59,12 +62,9 @@ import (
 	"k8s.io/kubernetes/pkg/kubelet/stats/pidlimit"
 	"k8s.io/kubernetes/pkg/kubelet/status"
 	schedulernodeinfo "k8s.io/kubernetes/pkg/scheduler/nodeinfo"
-	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/util/oom"
 	"k8s.io/kubernetes/pkg/util/procfs"
 	utilsysctl "k8s.io/kubernetes/pkg/util/sysctl"
-	utilio "k8s.io/utils/io"
-	utilpath "k8s.io/utils/path"
 )
 
 const (

pkg/kubelet/cm/container_manager_linux_test.go

@@ -27,7 +27,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"k8s.io/kubernetes/pkg/util/mount"
+	"k8s.io/utils/mount"
 )
 
 func fakeContainerMgrMountInt() mount.Interface {

pkg/kubelet/cm/container_manager_unsupported.go

@@ -21,13 +21,14 @@ package cm
 import (
 	"fmt"
 
-	"k8s.io/api/core/v1"
+	"k8s.io/utils/mount"
+
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/tools/record"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	"k8s.io/kubernetes/pkg/kubelet/cadvisor"
 	"k8s.io/kubernetes/pkg/kubelet/config"
 	"k8s.io/kubernetes/pkg/kubelet/status"
-	"k8s.io/kubernetes/pkg/util/mount"
 )
 
 type unsupportedContainerManager struct {

pkg/kubelet/cm/container_manager_windows.go

@@ -24,12 +24,14 @@ package cm
 import (
 	"fmt"
 
+	"k8s.io/klog"
+	"k8s.io/utils/mount"
+
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	utilfeature "k8s.io/apiserver/pkg/util/feature"
 	"k8s.io/client-go/tools/record"
 	internalapi "k8s.io/cri-api/pkg/apis"
-	"k8s.io/klog"
 	kubefeatures "k8s.io/kubernetes/pkg/features"
 	podresourcesapi "k8s.io/kubernetes/pkg/kubelet/apis/podresources/v1alpha1"
 	"k8s.io/kubernetes/pkg/kubelet/cadvisor"
@@ -41,7 +43,6 @@ import (
 	"k8s.io/kubernetes/pkg/kubelet/pluginmanager/cache"
 	"k8s.io/kubernetes/pkg/kubelet/status"
 	schedulernodeinfo "k8s.io/kubernetes/pkg/scheduler/nodeinfo"
-	"k8s.io/kubernetes/pkg/util/mount"
 )
 
 type containerManagerImpl struct {

pkg/kubelet/kubelet.go

@@ -33,6 +33,11 @@ import (
 	"time"
 
 	cadvisorapi "github.com/google/cadvisor/info/v1"
+	utilexec "k8s.io/utils/exec"
+	"k8s.io/utils/integer"
+	"k8s.io/utils/mount"
+	utilnet "k8s.io/utils/net"
+
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/fields"
@@ -108,7 +113,6 @@ import (
 	"k8s.io/kubernetes/pkg/security/apparmor"
 	sysctlwhitelist "k8s.io/kubernetes/pkg/security/podsecuritypolicy/sysctl"
 	utilipt "k8s.io/kubernetes/pkg/util/iptables"
-	"k8s.io/kubernetes/pkg/util/mount"
 	nodeutil "k8s.io/kubernetes/pkg/util/node"
 	"k8s.io/kubernetes/pkg/util/oom"
 	"k8s.io/kubernetes/pkg/util/selinux"
@@ -117,9 +121,6 @@ import (
 	"k8s.io/kubernetes/pkg/volume/util/hostutil"
 	"k8s.io/kubernetes/pkg/volume/util/subpath"
 	"k8s.io/kubernetes/pkg/volume/util/volumepathhandler"
-	utilexec "k8s.io/utils/exec"
-	"k8s.io/utils/integer"
-	utilnet "k8s.io/utils/net"
 )
 
 const (

pkg/kubelet/kubelet_getters.go

@@ -24,16 +24,16 @@ import (
 	"path/filepath"
 
 	cadvisorapiv1 "github.com/google/cadvisor/info/v1"
-	v1 "k8s.io/api/core/v1"
 	"k8s.io/klog"
+	"k8s.io/utils/mount"
+	utilpath "k8s.io/utils/path"
 
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/kubernetes/pkg/kubelet/cm"
 	"k8s.io/kubernetes/pkg/kubelet/config"
 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
-	"k8s.io/kubernetes/pkg/util/mount"
 	utilnode "k8s.io/kubernetes/pkg/util/node"
-	utilpath "k8s.io/utils/path"
 )
 
 // getRootDir returns the full path to the directory under which kubelet can

pkg/kubelet/kubelet_test.go

@@ -27,6 +27,8 @@ import (
 	cadvisorapi "github.com/google/cadvisor/info/v1"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"k8s.io/utils/mount"
+
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -67,7 +69,6 @@ import (
 	"k8s.io/kubernetes/pkg/kubelet/util/queue"
 	kubeletvolume "k8s.io/kubernetes/pkg/kubelet/volumemanager"
 	schedulernodeinfo "k8s.io/kubernetes/pkg/scheduler/nodeinfo"
-	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume"
 	"k8s.io/kubernetes/pkg/volume/awsebs"
 	"k8s.io/kubernetes/pkg/volume/azure_dd"

pkg/kubelet/runonce_test.go

@@ -23,6 +23,8 @@ import (
 
 	cadvisorapi "github.com/google/cadvisor/info/v1"
 	cadvisorapiv2 "github.com/google/cadvisor/info/v2"
+	"k8s.io/utils/mount"
+
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -43,7 +45,6 @@ import (
 	"k8s.io/kubernetes/pkg/kubelet/status"
 	statustest "k8s.io/kubernetes/pkg/kubelet/status/testing"
 	"k8s.io/kubernetes/pkg/kubelet/volumemanager"
-	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume"
 	volumetest "k8s.io/kubernetes/pkg/volume/testing"
 	"k8s.io/kubernetes/pkg/volume/util/hostutil"

pkg/kubelet/volume_host.go

@@ -22,6 +22,8 @@ import (
 	"runtime"
 
 	"k8s.io/klog"
+	utilexec "k8s.io/utils/exec"
+	"k8s.io/utils/mount"
 
 	authenticationv1 "k8s.io/api/authentication/v1"
 	v1 "k8s.io/api/core/v1"
@@ -34,13 +36,10 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/tools/record"
 	cloudprovider "k8s.io/cloud-provider"
-	utilexec "k8s.io/utils/exec"
-
 	"k8s.io/kubernetes/pkg/features"
 	"k8s.io/kubernetes/pkg/kubelet/configmap"
 	"k8s.io/kubernetes/pkg/kubelet/secret"
 	"k8s.io/kubernetes/pkg/kubelet/token"
-	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume"
 	"k8s.io/kubernetes/pkg/volume/util"
 	"k8s.io/kubernetes/pkg/volume/util/hostutil"

pkg/kubelet/volumemanager/BUILD

@@ -23,7 +23,6 @@ go_library(
         "//pkg/kubelet/volumemanager/metrics:go_default_library",
         "//pkg/kubelet/volumemanager/populator:go_default_library",
         "//pkg/kubelet/volumemanager/reconciler:go_default_library",
-        "//pkg/util/mount:go_default_library",
         "//pkg/volume:go_default_library",
         "//pkg/volume/csimigration:go_default_library",
         "//pkg/volume/util:go_default_library",
@@ -40,6 +39,7 @@ go_library(
         "//staging/src/k8s.io/client-go/tools/record:go_default_library",
         "//staging/src/k8s.io/csi-translation-lib:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
+        "//vendor/k8s.io/utils/mount:go_default_library",
     ],
 )
 
@@ -57,7 +57,6 @@ go_test(
         "//pkg/kubelet/secret:go_default_library",
         "//pkg/kubelet/status:go_default_library",
         "//pkg/kubelet/status/testing:go_default_library",
-        "//pkg/util/mount:go_default_library",
         "//pkg/volume:go_default_library",
         "//pkg/volume/testing:go_default_library",
         "//pkg/volume/util:go_default_library",
@@ -73,6 +72,7 @@ go_test(
         "//staging/src/k8s.io/client-go/tools/record:go_default_library",
         "//staging/src/k8s.io/client-go/util/testing:go_default_library",
         "//staging/src/k8s.io/component-base/featuregate/testing:go_default_library",
+        "//vendor/k8s.io/utils/mount:go_default_library",
     ],
 )
 

pkg/kubelet/volumemanager/reconciler/BUILD

@@ -15,7 +15,6 @@ go_library(
         "//pkg/kubelet/config:go_default_library",
         "//pkg/kubelet/volumemanager/cache:go_default_library",
         "//pkg/util/goroutinemap/exponentialbackoff:go_default_library",
-        "//pkg/util/mount:go_default_library",
         "//pkg/volume:go_default_library",
         "//pkg/volume/util:go_default_library",
         "//pkg/volume/util/hostutil:go_default_library",
@@ -29,6 +28,7 @@ go_library(
         "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
         "//staging/src/k8s.io/client-go/kubernetes:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
+        "//vendor/k8s.io/utils/mount:go_default_library",
         "//vendor/k8s.io/utils/path:go_default_library",
         "//vendor/k8s.io/utils/strings:go_default_library",
     ],
@@ -41,7 +41,6 @@ go_test(
     deps = [
         "//pkg/features:go_default_library",
         "//pkg/kubelet/volumemanager/cache:go_default_library",
-        "//pkg/util/mount:go_default_library",
         "//pkg/volume:go_default_library",
         "//pkg/volume/testing:go_default_library",
         "//pkg/volume/util:go_default_library",
@@ -60,6 +59,7 @@ go_test(
         "//staging/src/k8s.io/component-base/featuregate/testing:go_default_library",
         "//vendor/github.com/stretchr/testify/assert:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
+        "//vendor/k8s.io/utils/mount:go_default_library",
     ],
 )
 

pkg/kubelet/volumemanager/reconciler/reconciler.go

@@ -27,26 +27,27 @@ import (
 	"path/filepath"
 	"time"
 
+	"k8s.io/klog"
+	"k8s.io/utils/mount"
+	utilpath "k8s.io/utils/path"
+	utilstrings "k8s.io/utils/strings"
+
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/wait"
 	utilfeature "k8s.io/apiserver/pkg/util/feature"
 	clientset "k8s.io/client-go/kubernetes"
-	"k8s.io/klog"
 	"k8s.io/kubernetes/pkg/features"
 	"k8s.io/kubernetes/pkg/kubelet/config"
 	"k8s.io/kubernetes/pkg/kubelet/volumemanager/cache"
 	"k8s.io/kubernetes/pkg/util/goroutinemap/exponentialbackoff"
-	"k8s.io/kubernetes/pkg/util/mount"
 	volumepkg "k8s.io/kubernetes/pkg/volume"
 	"k8s.io/kubernetes/pkg/volume/util"
 	"k8s.io/kubernetes/pkg/volume/util/hostutil"
 	"k8s.io/kubernetes/pkg/volume/util/nestedpendingoperations"
 	"k8s.io/kubernetes/pkg/volume/util/operationexecutor"
 	volumetypes "k8s.io/kubernetes/pkg/volume/util/types"
-	utilpath "k8s.io/utils/path"
-	utilstrings "k8s.io/utils/strings"
 )
 
 // Reconciler runs a periodic loop to reconcile the desired state of the world

pkg/kubelet/volumemanager/reconciler/reconciler_test.go

@@ -22,6 +22,9 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
+	"k8s.io/klog"
+	"k8s.io/utils/mount"
+
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -33,10 +36,8 @@ import (
 	core "k8s.io/client-go/testing"
 	"k8s.io/client-go/tools/record"
 	featuregatetesting "k8s.io/component-base/featuregate/testing"
-	"k8s.io/klog"
 	"k8s.io/kubernetes/pkg/features"
 	"k8s.io/kubernetes/pkg/kubelet/volumemanager/cache"
-	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume"
 	volumetesting "k8s.io/kubernetes/pkg/volume/testing"
 	"k8s.io/kubernetes/pkg/volume/util"

pkg/kubelet/volumemanager/volume_manager.go

@@ -24,6 +24,9 @@ import (
 	"strings"
 	"time"
 
+	"k8s.io/klog"
+	"k8s.io/utils/mount"
+
 	v1 "k8s.io/api/core/v1"
 	k8stypes "k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/runtime"
@@ -32,7 +35,6 @@ import (
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/record"
 	csitrans "k8s.io/csi-translation-lib"
-	"k8s.io/klog"
 	"k8s.io/kubernetes/pkg/kubelet/config"
 	"k8s.io/kubernetes/pkg/kubelet/container"
 	"k8s.io/kubernetes/pkg/kubelet/pod"
@@ -42,7 +44,6 @@ import (
 	"k8s.io/kubernetes/pkg/kubelet/volumemanager/metrics"
 	"k8s.io/kubernetes/pkg/kubelet/volumemanager/populator"
 	"k8s.io/kubernetes/pkg/kubelet/volumemanager/reconciler"
-	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume"
 	"k8s.io/kubernetes/pkg/volume/csimigration"
 	"k8s.io/kubernetes/pkg/volume/util"

pkg/kubelet/volumemanager/volume_manager_test.go

@@ -23,6 +23,8 @@ import (
 	"testing"
 	"time"
 
+	"k8s.io/utils/mount"
+
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
@@ -42,7 +44,6 @@ import (
 	"k8s.io/kubernetes/pkg/kubelet/secret"
 	"k8s.io/kubernetes/pkg/kubelet/status"
 	statustest "k8s.io/kubernetes/pkg/kubelet/status/testing"
-	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume"
 	volumetest "k8s.io/kubernetes/pkg/volume/testing"
 	"k8s.io/kubernetes/pkg/volume/util"

pkg/kubemark/BUILD

@@ -28,7 +28,6 @@ go_library(
         "//pkg/proxy/config:go_default_library",
         "//pkg/proxy/iptables:go_default_library",
         "//pkg/util/iptables:go_default_library",
-        "//pkg/util/mount:go_default_library",
         "//pkg/util/node:go_default_library",
         "//pkg/util/oom:go_default_library",
         "//pkg/util/sysctl:go_default_library",
@@ -70,6 +69,7 @@ go_library(
         "//test/utils:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
         "//vendor/k8s.io/utils/exec:go_default_library",
+        "//vendor/k8s.io/utils/mount:go_default_library",
         "//vendor/k8s.io/utils/pointer:go_default_library",
     ],
 )

pkg/kubemark/hollow_kubelet.go

@@ -20,6 +20,9 @@ import (
 	"fmt"
 	"time"
 
+	"k8s.io/klog"
+	"k8s.io/utils/mount"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	clientset "k8s.io/client-go/kubernetes"
 	kubeletapp "k8s.io/kubernetes/cmd/kubelet/app"
@@ -31,7 +34,6 @@ import (
 	containertest "k8s.io/kubernetes/pkg/kubelet/container/testing"
 	"k8s.io/kubernetes/pkg/kubelet/dockershim"
 	kubetypes "k8s.io/kubernetes/pkg/kubelet/types"
-	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/util/oom"
 	"k8s.io/kubernetes/pkg/volume"
 	"k8s.io/kubernetes/pkg/volume/cephfs"
@@ -57,8 +59,6 @@ import (
 	"k8s.io/kubernetes/pkg/volume/util/hostutil"
 	"k8s.io/kubernetes/pkg/volume/util/subpath"
 	"k8s.io/kubernetes/test/utils"
-
-	"k8s.io/klog"
 )
 
 type HollowKubelet struct {

pkg/util/BUILD

@@ -31,7 +31,6 @@ filegroup(
         "//pkg/util/ipvs:all-srcs",
         "//pkg/util/labels:all-srcs",
         "//pkg/util/maps:all-srcs",
-        "//pkg/util/mount:all-srcs",
         "//pkg/util/netsh:all-srcs",
         "//pkg/util/node:all-srcs",
         "//pkg/util/oom:all-srcs",

pkg/util/mount/fake_exec.go

@@ -1,36 +0,0 @@
-/*
-Copyright 2017 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package mount
-
-// NewFakeExec returns a new FakeExec
-func NewFakeExec(run runHook) *FakeExec {
-	return &FakeExec{runHook: run}
-}
-
-// FakeExec for testing.
-type FakeExec struct {
-	runHook runHook
-}
-type runHook func(cmd string, args ...string) ([]byte, error)
-
-// Run executes the command using the optional runhook, if given
-func (f *FakeExec) Run(cmd string, args ...string) ([]byte, error) {
-	if f.runHook != nil {
-		return f.runHook(cmd, args...)
-	}
-	return nil, nil
-}

pkg/util/mount/mount_helper_test.go

@@ -1,139 +0,0 @@
-/*
-Copyright 2018 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package mount
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"runtime"
-	"syscall"
-	"testing"
-)
-
-func TestDoCleanupMountPoint(t *testing.T) {
-
-	if runtime.GOOS == "darwin" {
-		t.Skipf("not supported on GOOS=%s", runtime.GOOS)
-	}
-
-	const testMount = "test-mount"
-	const defaultPerm = 0750
-
-	tests := map[string]struct {
-		corruptedMnt bool
-		// Function that prepares the directory structure for the test under
-		// the given base directory.
-		// Returns a fake MountPoint, a fake error for the mount point,
-		// and error if the prepare function encountered a fatal error.
-		prepare   func(base string) (MountPoint, error, error)
-		expectErr bool
-	}{
-		"mount-ok": {
-			prepare: func(base string) (MountPoint, error, error) {
-				path := filepath.Join(base, testMount)
-				if err := os.MkdirAll(path, defaultPerm); err != nil {
-					return MountPoint{}, nil, err
-				}
-				return MountPoint{Device: "/dev/sdb", Path: path}, nil, nil
-			},
-		},
-		"mount-corrupted": {
-			prepare: func(base string) (MountPoint, error, error) {
-				path := filepath.Join(base, testMount)
-				if err := os.MkdirAll(path, defaultPerm); err != nil {
-					return MountPoint{}, nil, err
-				}
-				return MountPoint{Device: "/dev/sdb", Path: path}, os.NewSyscallError("fake", syscall.ESTALE), nil
-			},
-			corruptedMnt: true,
-		},
-		"mount-err-not-corrupted": {
-			prepare: func(base string) (MountPoint, error, error) {
-				path := filepath.Join(base, testMount)
-				if err := os.MkdirAll(path, defaultPerm); err != nil {
-					return MountPoint{}, nil, err
-				}
-				return MountPoint{Device: "/dev/sdb", Path: path}, os.NewSyscallError("fake", syscall.ETIMEDOUT), nil
-			},
-			expectErr: true,
-		},
-	}
-
-	for name, tt := range tests {
-		t.Run(name, func(t *testing.T) {
-
-			tmpDir, err := ioutil.TempDir("", "unmount-mount-point-test")
-			if err != nil {
-				t.Fatalf("failed to create tmpdir: %v", err)
-			}
-			defer os.RemoveAll(tmpDir)
-
-			if tt.prepare == nil {
-				t.Fatalf("prepare function required")
-			}
-
-			mountPoint, mountError, err := tt.prepare(tmpDir)
-			if err != nil {
-				t.Fatalf("failed to prepare test: %v", err)
-			}
-
-			fake := NewFakeMounter(
-				[]MountPoint{mountPoint},
-			)
-			fake.MountCheckErrors = map[string]error{mountPoint.Path: mountError}
-
-			err = doCleanupMountPoint(mountPoint.Path, fake, true, tt.corruptedMnt)
-			if tt.expectErr {
-				if err == nil {
-					t.Errorf("test %s failed, expected error, got none", name)
-				}
-				if err := validateDirExists(mountPoint.Path); err != nil {
-					t.Errorf("test %s failed, mount path doesn't exist: %v", name, err)
-				}
-			}
-			if !tt.expectErr {
-				if err != nil {
-					t.Errorf("test %s failed: %v", name, err)
-				}
-				if err := validateDirNotExists(mountPoint.Path); err != nil {
-					t.Errorf("test %s failed, mount path still exists: %v", name, err)
-				}
-			}
-		})
-	}
-}
-
-func validateDirExists(dir string) error {
-	_, err := ioutil.ReadDir(dir)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func validateDirNotExists(dir string) error {
-	_, err := ioutil.ReadDir(dir)
-	if os.IsNotExist(err) {
-		return nil
-	}
-	if err != nil {
-		return err
-	}
-	return fmt.Errorf("dir %q still exists", dir)
-}

pkg/util/mount/mount_helper_unix_test.go

@@ -1,215 +0,0 @@
-// +build !windows
-
-/*
-Copyright 2019 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package mount
-
-import (
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"reflect"
-	"testing"
-)
-
-func writeFile(content string) (string, string, error) {
-	tempDir, err := ioutil.TempDir("", "mounter_shared_test")
-	if err != nil {
-		return "", "", err
-	}
-	filename := filepath.Join(tempDir, "mountinfo")
-	err = ioutil.WriteFile(filename, []byte(content), 0600)
-	if err != nil {
-		os.RemoveAll(tempDir)
-		return "", "", err
-	}
-	return tempDir, filename, nil
-}
-
-func TestParseMountInfo(t *testing.T) {
-	info :=
-		`62 0 253:0 / / rw,relatime shared:1 - ext4 /dev/mapper/ssd-root rw,seclabel,data=ordered
-78 62 0:41 / /tmp rw,nosuid,nodev shared:30 - tmpfs tmpfs rw,seclabel
-80 62 0:42 / /var/lib/nfs/rpc_pipefs rw,relatime shared:31 - rpc_pipefs sunrpc rw
-82 62 0:43 / /var/lib/foo rw,relatime shared:32 - tmpfs tmpfs rw
-83 63 0:44 / /var/lib/bar rw,relatime - tmpfs tmpfs rw
-227 62 253:0 /var/lib/docker/devicemapper /var/lib/docker/devicemapper rw,relatime - ext4 /dev/mapper/ssd-root rw,seclabel,data=ordered
-224 62 253:0 /var/lib/docker/devicemapper/test/shared /var/lib/docker/devicemapper/test/shared rw,relatime master:1 shared:44 - ext4 /dev/mapper/ssd-root rw,seclabel,data=ordered
-76 17 8:1 / /mnt/stateful_partition rw,nosuid,nodev,noexec,relatime - ext4 /dev/sda1 rw,commit=30,data=ordered
-80 17 8:1 /var /var rw,nosuid,nodev,noexec,relatime shared:30 - ext4 /dev/sda1 rw,commit=30,data=ordered
-189 80 8:1 /var/lib/kubelet /var/lib/kubelet rw,relatime shared:30 - ext4 /dev/sda1 rw,commit=30,data=ordered
-818 77 8:40 / /var/lib/kubelet/pods/c25464af-e52e-11e7-ab4d-42010a800002/volumes/kubernetes.io~gce-pd/vol1 rw,relatime shared:290 - ext4 /dev/sdc rw,data=ordered
-819 78 8:48 / /var/lib/kubelet/pods/c25464af-e52e-11e7-ab4d-42010a800002/volumes/kubernetes.io~gce-pd/vol1 rw,relatime shared:290 - ext4 /dev/sdd rw,data=ordered
-900 100 8:48 /dir1 /var/lib/kubelet/pods/c25464af-e52e-11e7-ab4d-42010a800002/volume-subpaths/vol1/subpath1/0 rw,relatime shared:290 - ext4 /dev/sdd rw,data=ordered
-901 101 8:1 /dir1 /var/lib/kubelet/pods/c25464af-e52e-11e7-ab4d-42010a800002/volume-subpaths/vol1/subpath1/1 rw,relatime shared:290 - ext4 /dev/sdd rw,data=ordered
-902 102 8:1 /var/lib/kubelet/pods/d4076f24-e53a-11e7-ba15-42010a800002/volumes/kubernetes.io~empty-dir/vol1/dir1 /var/lib/kubelet/pods/d4076f24-e53a-11e7-ba15-42010a800002/volume-subpaths/vol1/subpath1/0 rw,relatime shared:30 - ext4 /dev/sda1 rw,commit=30,data=ordered
-903 103 8:1 /var/lib/kubelet/pods/d4076f24-e53a-11e7-ba15-42010a800002/volumes/kubernetes.io~empty-dir/vol2/dir1 /var/lib/kubelet/pods/d4076f24-e53a-11e7-ba15-42010a800002/volume-subpaths/vol1/subpath1/1 rw,relatime shared:30 - ext4 /dev/sda1 rw,commit=30,data=ordered
-178 25 253:0 /etc/bar /var/lib/kubelet/pods/12345/volume-subpaths/vol1/subpath1/0 rw,relatime shared:1 - ext4 /dev/sdb2 rw,errors=remount-ro,data=ordered
-698 186 0:41 /tmp1/dir1 /var/lib/kubelet/pods/41135147-e697-11e7-9342-42010a800002/volume-subpaths/vol1/subpath1/0 rw shared:26 - tmpfs tmpfs rw
-918 77 8:50 / /var/lib/kubelet/pods/2345/volumes/kubernetes.io~gce-pd/vol1 rw,relatime shared:290 - ext4 /dev/sdc rw,data=ordered
-919 78 8:58 / /var/lib/kubelet/pods/2345/volumes/kubernetes.io~gce-pd/vol1 rw,relatime shared:290 - ext4 /dev/sdd rw,data=ordered
-920 100 8:50 /dir1 /var/lib/kubelet/pods/2345/volume-subpaths/vol1/subpath1/0 rw,relatime shared:290 - ext4 /dev/sdc rw,data=ordered
-150 23 1:58 / /media/nfs_vol rw,relatime shared:89 - nfs4 172.18.4.223:/srv/nfs rw,vers=4.0,rsize=524288,wsize=524288,namlen=255,hard,proto=tcp,port=0,timeo=600,retrans=2,sec=sys,clientaddr=172.18.4.223,local_lock=none,addr=172.18.4.223
-151 24 1:58 / /media/nfs_bindmount rw,relatime shared:89 - nfs4 172.18.4.223:/srv/nfs/foo rw,vers=4.0,rsize=524288,wsize=524288,namlen=255,hard,proto=tcp,port=0,timeo=600,retrans=2,sec=sys,clientaddr=172.18.4.223,local_lock=none,addr=172.18.4.223
-134 23 0:58 / /var/lib/kubelet/pods/43219158-e5e1-11e7-a392-0e858b8eaf40/volumes/kubernetes.io~nfs/nfs1 rw,relatime shared:89 - nfs4 172.18.4.223:/srv/nfs rw,vers=4.0,rsize=524288,wsize=524288,namlen=255,hard,proto=tcp,port=0,timeo=600,retrans=2,sec=sys,clientaddr=172.18.4.223,local_lock=none,addr=172.18.4.223
-187 23 0:58 / /var/lib/kubelet/pods/1fc5ea21-eff4-11e7-ac80-0e858b8eaf40/volumes/kubernetes.io~nfs/nfs2 rw,relatime shared:96 - nfs4 172.18.4.223:/srv/nfs2 rw,vers=4.0,rsize=524288,wsize=524288,namlen=255,hard,proto=tcp,port=0,timeo=600,retrans=2,sec=sys,clientaddr=172.18.4.223,local_lock=none,addr=172.18.4.223
-188 24 0:58 / /var/lib/kubelet/pods/43219158-e5e1-11e7-a392-0e858b8eaf40/volume-subpaths/nfs1/subpath1/0 rw,relatime shared:89 - nfs4 172.18.4.223:/srv/nfs/foo rw,vers=4.0,rsize=524288,wsize=524288,namlen=255,hard,proto=tcp,port=0,timeo=600,retrans=2,sec=sys,clientaddr=172.18.4.223,local_lock=none,addr=172.18.4.223
-347 60 0:71 / /var/lib/kubelet/pods/13195d46-f9fa-11e7-bbf1-5254007a695a/volumes/kubernetes.io~nfs/vol2 rw,relatime shared:170 - nfs 172.17.0.3:/exports/2 rw,vers=3,rsize=1048576,wsize=1048576,namlen=255,hard,proto=tcp,timeo=600,retrans=2,sec=sys,mountaddr=172.17.0.3,mountvers=3,mountport=20048,mountproto=udp,local_lock=none,addr=172.17.0.3
-222 24 253:0 /tmp/src /mnt/dst rw,relatime shared:1 - ext4 /dev/mapper/vagrant--vg-root rw,errors=remount-ro,data=ordered
-28 18 0:24 / /sys/fs/cgroup ro,nosuid,nodev,noexec shared:9 - tmpfs tmpfs ro,mode=755
-29 28 0:25 / /sys/fs/cgroup/systemd rw,nosuid,nodev,noexec,relatime shared:10 - cgroup cgroup rw,xattr,release_agent=/lib/systemd/systemd-cgroups-agent,name=systemd
-31 28 0:27 / /sys/fs/cgroup/cpuset rw,nosuid,nodev,noexec,relatime shared:13 - cgroup cgroup rw,cpuset
-32 28 0:28 / /sys/fs/cgroup/cpu,cpuacct rw,nosuid,nodev,noexec,relatime shared:14 - cgroup cgroup rw,cpu,cpuacct
-33 28 0:29 / /sys/fs/cgroup/freezer rw,nosuid,nodev,noexec,relatime shared:15 - cgroup cgroup rw,freezer
-34 28 0:30 / /sys/fs/cgroup/net_cls,net_prio rw,nosuid,nodev,noexec,relatime shared:16 - cgroup cgroup rw,net_cls,net_prio
-35 28 0:31 / /sys/fs/cgroup/pids rw,nosuid,nodev,noexec,relatime shared:17 - cgroup cgroup rw,pids
-36 28 0:32 / /sys/fs/cgroup/devices rw,nosuid,nodev,noexec,relatime shared:18 - cgroup cgroup rw,devices
-37 28 0:33 / /sys/fs/cgroup/hugetlb rw,nosuid,nodev,noexec,relatime shared:19 - cgroup cgroup rw,hugetlb
-38 28 0:34 / /sys/fs/cgroup/blkio rw,nosuid,nodev,noexec,relatime shared:20 - cgroup cgroup rw,blkio
-39 28 0:35 / /sys/fs/cgroup/memory rw,nosuid,nodev,noexec,relatime shared:21 - cgroup cgroup rw,memory
-40 28 0:36 / /sys/fs/cgroup/perf_event rw,nosuid,nodev,noexec,relatime shared:22 - cgroup cgroup rw,perf_event
-`
-	tempDir, filename, err := writeFile(info)
-	if err != nil {
-		t.Fatalf("cannot create temporary file: %v", err)
-	}
-	defer os.RemoveAll(tempDir)
-
-	tests := []struct {
-		name         string
-		id           int
-		expectedInfo MountInfo
-	}{
-		{
-			"simple bind mount",
-			189,
-			MountInfo{
-				ID:             189,
-				ParentID:       80,
-				MajorMinor:     "8:1",
-				Root:           "/var/lib/kubelet",
-				Source:         "/dev/sda1",
-				MountPoint:     "/var/lib/kubelet",
-				OptionalFields: []string{"shared:30"},
-				FsType:         "ext4",
-				MountOptions:   []string{"rw", "relatime"},
-				SuperOptions:   []string{"rw", "commit=30", "data=ordered"},
-			},
-		},
-		{
-			"bind mount a directory",
-			222,
-			MountInfo{
-				ID:             222,
-				ParentID:       24,
-				MajorMinor:     "253:0",
-				Root:           "/tmp/src",
-				Source:         "/dev/mapper/vagrant--vg-root",
-				MountPoint:     "/mnt/dst",
-				OptionalFields: []string{"shared:1"},
-				FsType:         "ext4",
-				MountOptions:   []string{"rw", "relatime"},
-				SuperOptions:   []string{"rw", "errors=remount-ro", "data=ordered"},
-			},
-		},
-		{
-			"more than one optional fields",
-			224,
-			MountInfo{
-				ID:             224,
-				ParentID:       62,
-				MajorMinor:     "253:0",
-				Root:           "/var/lib/docker/devicemapper/test/shared",
-				Source:         "/dev/mapper/ssd-root",
-				MountPoint:     "/var/lib/docker/devicemapper/test/shared",
-				OptionalFields: []string{"master:1", "shared:44"},
-				FsType:         "ext4",
-				MountOptions:   []string{"rw", "relatime"},
-				SuperOptions:   []string{"rw", "seclabel", "data=ordered"},
-			},
-		},
-		{
-			"cgroup-mountpoint",
-			28,
-			MountInfo{
-				ID:             28,
-				ParentID:       18,
-				MajorMinor:     "0:24",
-				Root:           "/",
-				Source:         "tmpfs",
-				MountPoint:     "/sys/fs/cgroup",
-				OptionalFields: []string{"shared:9"},
-				FsType:         "tmpfs",
-				MountOptions:   []string{"ro", "nosuid", "nodev", "noexec"},
-				SuperOptions:   []string{"ro", "mode=755"},
-			},
-		},
-		{
-			"cgroup-subsystem-systemd-mountpoint",
-			29,
-			MountInfo{
-				ID:             29,
-				ParentID:       28,
-				MajorMinor:     "0:25",
-				Root:           "/",
-				Source:         "cgroup",
-				MountPoint:     "/sys/fs/cgroup/systemd",
-				OptionalFields: []string{"shared:10"},
-				FsType:         "cgroup",
-				MountOptions:   []string{"rw", "nosuid", "nodev", "noexec", "relatime"},
-				SuperOptions:   []string{"rw", "xattr", "release_agent=/lib/systemd/systemd-cgroups-agent", "name=systemd"},
-			},
-		},
-		{
-			"cgroup-subsystem-cpuset-mountpoint",
-			31,
-			MountInfo{
-				ID:             31,
-				ParentID:       28,
-				MajorMinor:     "0:27",
-				Root:           "/",
-				Source:         "cgroup",
-				MountPoint:     "/sys/fs/cgroup/cpuset",
-				OptionalFields: []string{"shared:13"},
-				FsType:         "cgroup",
-				MountOptions:   []string{"rw", "nosuid", "nodev", "noexec", "relatime"},
-				SuperOptions:   []string{"rw", "cpuset"},
-			},
-		},
-	}
-
-	infos, err := ParseMountInfo(filename)
-	if err != nil {
-		t.Fatalf("Cannot parse %s: %s", filename, err)
-	}
-
-	for _, test := range tests {
-		found := false
-		for _, info := range infos {
-			if info.ID == test.id {
-				found = true
-				if !reflect.DeepEqual(info, test.expectedInfo) {
-					t.Errorf("Test case %q:\n expected: %+v\n got:      %+v", test.name, test.expectedInfo, info)
-				}
-				break
-			}
-		}
-		if !found {
-			t.Errorf("Test case %q: mountPoint %d not found", test.name, test.id)
-		}
-	}
-}

pkg/util/mount/mount_helper_windows_test.go

@@ -1,65 +0,0 @@
-// +build windows
-
-/*
-Copyright 2017 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package mount
-
-import (
-	"testing"
-)
-
-func TestNormalizeWindowsPath(t *testing.T) {
-	path := `/var/lib/kubelet/pods/146f8428-83e7-11e7-8dd4-000d3a31dac4/volumes/kubernetes.io~azure-disk`
-	normalizedPath := NormalizeWindowsPath(path)
-	if normalizedPath != `c:\var\lib\kubelet\pods\146f8428-83e7-11e7-8dd4-000d3a31dac4\volumes\kubernetes.io~azure-disk` {
-		t.Errorf("normizeWindowsPath test failed, normalizedPath : %q", normalizedPath)
-	}
-
-	path = `/var/lib/kubelet/pods/146f8428-83e7-11e7-8dd4-000d3a31dac4\volumes\kubernetes.io~azure-disk`
-	normalizedPath = NormalizeWindowsPath(path)
-	if normalizedPath != `c:\var\lib\kubelet\pods\146f8428-83e7-11e7-8dd4-000d3a31dac4\volumes\kubernetes.io~azure-disk` {
-		t.Errorf("normizeWindowsPath test failed, normalizedPath : %q", normalizedPath)
-	}
-
-	path = `/`
-	normalizedPath = NormalizeWindowsPath(path)
-	if normalizedPath != `c:\` {
-		t.Errorf("normizeWindowsPath test failed, normalizedPath : %q", normalizedPath)
-	}
-}
-
-func TestValidateDiskNumber(t *testing.T) {
-	diskNum := "0"
-	if err := ValidateDiskNumber(diskNum); err != nil {
-		t.Errorf("TestValidateDiskNumber test failed, disk number : %s", diskNum)
-	}
-
-	diskNum = "99"
-	if err := ValidateDiskNumber(diskNum); err != nil {
-		t.Errorf("TestValidateDiskNumber test failed, disk number : %s", diskNum)
-	}
-
-	diskNum = "ab"
-	if err := ValidateDiskNumber(diskNum); err == nil {
-		t.Errorf("TestValidateDiskNumber test failed, disk number : %s", diskNum)
-	}
-
-	diskNum = "100"
-	if err := ValidateDiskNumber(diskNum); err == nil {
-		t.Errorf("TestValidateDiskNumber test failed, disk number : %s", diskNum)
-	}
-}

pkg/util/mount/mount_linux_test.go

@@ -1,439 +0,0 @@
-// +build linux
-
-/*
-Copyright 2014 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package mount
-
-import (
-	"io/ioutil"
-	"os"
-	"reflect"
-	"testing"
-)
-
-func TestReadProcMountsFrom(t *testing.T) {
-	successCase :=
-		`/dev/0 /path/to/0 type0 flags 0 0
-/dev/1    /path/to/1   type1	flags 1 1
-/dev/2 /path/to/2 type2 flags,1,2=3 2 2
-`
-	// NOTE: readProcMountsFrom has been updated to using fnv.New32a()
-	mounts, err := parseProcMounts([]byte(successCase))
-	if err != nil {
-		t.Errorf("expected success, got %v", err)
-	}
-	if len(mounts) != 3 {
-		t.Fatalf("expected 3 mounts, got %d", len(mounts))
-	}
-	mp := MountPoint{"/dev/0", "/path/to/0", "type0", []string{"flags"}, 0, 0}
-	if !mountPointsEqual(&mounts[0], &mp) {
-		t.Errorf("got unexpected MountPoint[0]: %#v", mounts[0])
-	}
-	mp = MountPoint{"/dev/1", "/path/to/1", "type1", []string{"flags"}, 1, 1}
-	if !mountPointsEqual(&mounts[1], &mp) {
-		t.Errorf("got unexpected MountPoint[1]: %#v", mounts[1])
-	}
-	mp = MountPoint{"/dev/2", "/path/to/2", "type2", []string{"flags", "1", "2=3"}, 2, 2}
-	if !mountPointsEqual(&mounts[2], &mp) {
-		t.Errorf("got unexpected MountPoint[2]: %#v", mounts[2])
-	}
-
-	errorCases := []string{
-		"/dev/0 /path/to/mount\n",
-		"/dev/1 /path/to/mount type flags a 0\n",
-		"/dev/2 /path/to/mount type flags 0 b\n",
-	}
-	for _, ec := range errorCases {
-		_, err := parseProcMounts([]byte(ec))
-		if err == nil {
-			t.Errorf("expected error")
-		}
-	}
-}
-
-func mountPointsEqual(a, b *MountPoint) bool {
-	if a.Device != b.Device || a.Path != b.Path || a.Type != b.Type || !reflect.DeepEqual(a.Opts, b.Opts) || a.Pass != b.Pass || a.Freq != b.Freq {
-		return false
-	}
-	return true
-}
-
-func TestGetMountRefs(t *testing.T) {
-	fm := NewFakeMounter(
-		[]MountPoint{
-			{Device: "/dev/sdb", Path: "/var/lib/kubelet/plugins/kubernetes.io/gce-pd/mounts/gce-pd"},
-			{Device: "/dev/sdb", Path: "/var/lib/kubelet/pods/some-pod/volumes/kubernetes.io~gce-pd/gce-pd-in-pod"},
-			{Device: "/dev/sdc", Path: "/var/lib/kubelet/plugins/kubernetes.io/gce-pd/mounts/gce-pd2"},
-			{Device: "/dev/sdc", Path: "/var/lib/kubelet/pods/some-pod/volumes/kubernetes.io~gce-pd/gce-pd2-in-pod1"},
-			{Device: "/dev/sdc", Path: "/var/lib/kubelet/pods/some-pod/volumes/kubernetes.io~gce-pd/gce-pd2-in-pod2"},
-		})
-
-	tests := []struct {
-		mountPath    string
-		expectedRefs []string
-	}{
-		{
-			"/var/lib/kubelet/pods/some-pod/volumes/kubernetes.io~gce-pd/gce-pd-in-pod",
-			[]string{
-				"/var/lib/kubelet/plugins/kubernetes.io/gce-pd/mounts/gce-pd",
-			},
-		},
-		{
-			"/var/lib/kubelet/pods/some-pod/volumes/kubernetes.io~gce-pd/gce-pd2-in-pod1",
-			[]string{
-				"/var/lib/kubelet/pods/some-pod/volumes/kubernetes.io~gce-pd/gce-pd2-in-pod2",
-				"/var/lib/kubelet/plugins/kubernetes.io/gce-pd/mounts/gce-pd2",
-			},
-		},
-		{
-			"/var/fake/directory/that/doesnt/exist",
-			[]string{},
-		},
-	}
-
-	for i, test := range tests {
-		if refs, err := fm.GetMountRefs(test.mountPath); err != nil || !setEquivalent(test.expectedRefs, refs) {
-			t.Errorf("%d. getMountRefs(%q) = %v, %v; expected %v, nil", i, test.mountPath, refs, err, test.expectedRefs)
-		}
-	}
-}
-
-func setEquivalent(set1, set2 []string) bool {
-	map1 := make(map[string]bool)
-	map2 := make(map[string]bool)
-	for _, s := range set1 {
-		map1[s] = true
-	}
-	for _, s := range set2 {
-		map2[s] = true
-	}
-
-	for s := range map1 {
-		if !map2[s] {
-			return false
-		}
-	}
-	for s := range map2 {
-		if !map1[s] {
-			return false
-		}
-	}
-	return true
-}
-
-func TestGetDeviceNameFromMount(t *testing.T) {
-	fm := NewFakeMounter(
-		[]MountPoint{
-			{Device: "/dev/disk/by-path/prefix-lun-1",
-				Path: "/mnt/111"},
-			{Device: "/dev/disk/by-path/prefix-lun-1",
-				Path: "/mnt/222"},
-		})
-
-	tests := []struct {
-		mountPath      string
-		expectedDevice string
-		expectedRefs   int
-	}{
-		{
-			"/mnt/222",
-			"/dev/disk/by-path/prefix-lun-1",
-			2,
-		},
-	}
-
-	for i, test := range tests {
-		if device, refs, err := GetDeviceNameFromMount(fm, test.mountPath); err != nil || test.expectedRefs != refs || test.expectedDevice != device {
-			t.Errorf("%d. GetDeviceNameFromMount(%s) = (%s, %d), %v; expected (%s,%d), nil", i, test.mountPath, device, refs, err, test.expectedDevice, test.expectedRefs)
-		}
-	}
-}
-
-func TestGetMountRefsByDev(t *testing.T) {
-	fm := NewFakeMounter(
-		[]MountPoint{
-			{Device: "/dev/sdb", Path: "/var/lib/kubelet/plugins/kubernetes.io/gce-pd/mounts/gce-pd"},
-			{Device: "/dev/sdb", Path: "/var/lib/kubelet/pods/some-pod/volumes/kubernetes.io~gce-pd/gce-pd-in-pod"},
-			{Device: "/dev/sdc", Path: "/var/lib/kubelet/plugins/kubernetes.io/gce-pd/mounts/gce-pd2"},
-			{Device: "/dev/sdc", Path: "/var/lib/kubelet/pods/some-pod/volumes/kubernetes.io~gce-pd/gce-pd2-in-pod1"},
-			{Device: "/dev/sdc", Path: "/var/lib/kubelet/pods/some-pod/volumes/kubernetes.io~gce-pd/gce-pd2-in-pod2"},
-		})
-
-	tests := []struct {
-		mountPath    string
-		expectedRefs []string
-	}{
-		{
-			"/var/lib/kubelet/plugins/kubernetes.io/gce-pd/mounts/gce-pd",
-			[]string{
-				"/var/lib/kubelet/pods/some-pod/volumes/kubernetes.io~gce-pd/gce-pd-in-pod",
-			},
-		},
-		{
-			"/var/lib/kubelet/plugins/kubernetes.io/gce-pd/mounts/gce-pd2",
-			[]string{
-				"/var/lib/kubelet/pods/some-pod/volumes/kubernetes.io~gce-pd/gce-pd2-in-pod1",
-				"/var/lib/kubelet/pods/some-pod/volumes/kubernetes.io~gce-pd/gce-pd2-in-pod2",
-			},
-		},
-	}
-
-	for i, test := range tests {
-
-		if refs, err := getMountRefsByDev(fm, test.mountPath); err != nil || !setEquivalent(test.expectedRefs, refs) {
-			t.Errorf("%d. getMountRefsByDev(%q) = %v, %v; expected %v, nil", i, test.mountPath, refs, err, test.expectedRefs)
-		}
-	}
-}
-
-func TestPathWithinBase(t *testing.T) {
-	tests := []struct {
-		name     string
-		fullPath string
-		basePath string
-		expected bool
-	}{
-		{
-			name:     "good subpath",
-			fullPath: "/a/b/c",
-			basePath: "/a",
-			expected: true,
-		},
-		{
-			name:     "good subpath 2",
-			fullPath: "/a/b/c",
-			basePath: "/a/b",
-			expected: true,
-		},
-		{
-			name:     "good subpath end slash",
-			fullPath: "/a/b/c/",
-			basePath: "/a/b",
-			expected: true,
-		},
-		{
-			name:     "good subpath backticks",
-			fullPath: "/a/b/../c",
-			basePath: "/a",
-			expected: true,
-		},
-		{
-			name:     "good subpath equal",
-			fullPath: "/a/b/c",
-			basePath: "/a/b/c",
-			expected: true,
-		},
-		{
-			name:     "good subpath equal 2",
-			fullPath: "/a/b/c/",
-			basePath: "/a/b/c",
-			expected: true,
-		},
-		{
-			name:     "good subpath root",
-			fullPath: "/a",
-			basePath: "/",
-			expected: true,
-		},
-		{
-			name:     "bad subpath parent",
-			fullPath: "/a/b/c",
-			basePath: "/a/b/c/d",
-			expected: false,
-		},
-		{
-			name:     "bad subpath outside",
-			fullPath: "/b/c",
-			basePath: "/a/b/c",
-			expected: false,
-		},
-		{
-			name:     "bad subpath prefix",
-			fullPath: "/a/b/cd",
-			basePath: "/a/b/c",
-			expected: false,
-		},
-		{
-			name:     "bad subpath backticks",
-			fullPath: "/a/../b",
-			basePath: "/a",
-			expected: false,
-		},
-		{
-			name:     "configmap subpath",
-			fullPath: "/var/lib/kubelet/pods/uuid/volumes/kubernetes.io~configmap/config/..timestamp/file.txt",
-			basePath: "/var/lib/kubelet/pods/uuid/volumes/kubernetes.io~configmap/config",
-			expected: true,
-		},
-	}
-	for _, test := range tests {
-		if PathWithinBase(test.fullPath, test.basePath) != test.expected {
-			t.Errorf("test %q failed: expected %v", test.name, test.expected)
-		}
-
-	}
-}
-
-func TestSearchMountPoints(t *testing.T) {
-	base := `
-19 25 0:18 / /sys rw,nosuid,nodev,noexec,relatime shared:7 - sysfs sysfs rw
-20 25 0:4 / /proc rw,nosuid,nodev,noexec,relatime shared:12 - proc proc rw
-21 25 0:6 / /dev rw,nosuid,relatime shared:2 - devtmpfs udev rw,size=4058156k,nr_inodes=1014539,mode=755
-22 21 0:14 / /dev/pts rw,nosuid,noexec,relatime shared:3 - devpts devpts rw,gid=5,mode=620,ptmxmode=000
-23 25 0:19 / /run rw,nosuid,noexec,relatime shared:5 - tmpfs tmpfs rw,size=815692k,mode=755
-25 0 252:0 / / rw,relatime shared:1 - ext4 /dev/mapper/ubuntu--vg-root rw,errors=remount-ro,data=ordered
-26 19 0:12 / /sys/kernel/security rw,nosuid,nodev,noexec,relatime shared:8 - securityfs securityfs rw
-27 21 0:21 / /dev/shm rw,nosuid,nodev shared:4 - tmpfs tmpfs rw
-28 23 0:22 / /run/lock rw,nosuid,nodev,noexec,relatime shared:6 - tmpfs tmpfs rw,size=5120k
-29 19 0:23 / /sys/fs/cgroup ro,nosuid,nodev,noexec shared:9 - tmpfs tmpfs ro,mode=755
-30 29 0:24 / /sys/fs/cgroup/systemd rw,nosuid,nodev,noexec,relatime shared:10 - cgroup cgroup rw,xattr,release_agent=/lib/systemd/systemd-cgroups-agent,name=systemd
-31 19 0:25 / /sys/fs/pstore rw,nosuid,nodev,noexec,relatime shared:11 - pstore pstore rw
-32 29 0:26 / /sys/fs/cgroup/devices rw,nosuid,nodev,noexec,relatime shared:13 - cgroup cgroup rw,devices
-33 29 0:27 / /sys/fs/cgroup/freezer rw,nosuid,nodev,noexec,relatime shared:14 - cgroup cgroup rw,freezer
-34 29 0:28 / /sys/fs/cgroup/pids rw,nosuid,nodev,noexec,relatime shared:15 - cgroup cgroup rw,pids
-35 29 0:29 / /sys/fs/cgroup/blkio rw,nosuid,nodev,noexec,relatime shared:16 - cgroup cgroup rw,blkio
-36 29 0:30 / /sys/fs/cgroup/memory rw,nosuid,nodev,noexec,relatime shared:17 - cgroup cgroup rw,memory
-37 29 0:31 / /sys/fs/cgroup/perf_event rw,nosuid,nodev,noexec,relatime shared:18 - cgroup cgroup rw,perf_event
-38 29 0:32 / /sys/fs/cgroup/hugetlb rw,nosuid,nodev,noexec,relatime shared:19 - cgroup cgroup rw,hugetlb
-39 29 0:33 / /sys/fs/cgroup/cpu,cpuacct rw,nosuid,nodev,noexec,relatime shared:20 - cgroup cgroup rw,cpu,cpuacct
-40 29 0:34 / /sys/fs/cgroup/cpuset rw,nosuid,nodev,noexec,relatime shared:21 - cgroup cgroup rw,cpuset
-41 29 0:35 / /sys/fs/cgroup/net_cls,net_prio rw,nosuid,nodev,noexec,relatime shared:22 - cgroup cgroup rw,net_cls,net_prio
-58 25 7:1 / /mnt/disks/blkvol1 rw,relatime shared:38 - ext4 /dev/loop1 rw,data=ordere
-`
-
-	testcases := []struct {
-		name         string
-		source       string
-		mountInfos   string
-		expectedRefs []string
-		expectedErr  error
-	}{
-		{
-			"dir",
-			"/mnt/disks/vol1",
-			base,
-			nil,
-			nil,
-		},
-		{
-			"dir-used",
-			"/mnt/disks/vol1",
-			base + `
-56 25 252:0 /mnt/disks/vol1 /var/lib/kubelet/pods/1890aef5-5a60-11e8-962f-000c29bb0377/volumes/kubernetes.io~local-volume/local-pv-test rw,relatime shared:1 - ext4 /dev/mapper/ubuntu--vg-root rw,errors=remount-ro,data=ordered
-57 25 0:45 / /mnt/disks/vol rw,relatime shared:36 - tmpfs tmpfs rw
-`,
-			[]string{"/var/lib/kubelet/pods/1890aef5-5a60-11e8-962f-000c29bb0377/volumes/kubernetes.io~local-volume/local-pv-test"},
-			nil,
-		},
-		{
-			"tmpfs-vol",
-			"/mnt/disks/vol1",
-			base + `120 25 0:76 / /mnt/disks/vol1 rw,relatime shared:41 - tmpfs vol1 rw,size=10000k
-`,
-			nil,
-			nil,
-		},
-		{
-			"tmpfs-vol-used-by-two-pods",
-			"/mnt/disks/vol1",
-			base + `120 25 0:76 / /mnt/disks/vol1 rw,relatime shared:41 - tmpfs vol1 rw,size=10000k
-196 25 0:76 / /var/lib/kubelet/pods/ade3ac21-5a5b-11e8-8559-000c29bb0377/volumes/kubernetes.io~local-volume/local-pv-8f263585 rw,relatime shared:41 - tmpfs vol1 rw,size=10000k
-228 25 0:76 / /var/lib/kubelet/pods/ac60532d-5a5b-11e8-8559-000c29bb0377/volumes/kubernetes.io~local-volume/local-pv-8f263585 rw,relatime shared:41 - tmpfs vol1 rw,size=10000k
-`,
-			[]string{
-				"/var/lib/kubelet/pods/ade3ac21-5a5b-11e8-8559-000c29bb0377/volumes/kubernetes.io~local-volume/local-pv-8f263585",
-				"/var/lib/kubelet/pods/ac60532d-5a5b-11e8-8559-000c29bb0377/volumes/kubernetes.io~local-volume/local-pv-8f263585",
-			},
-			nil,
-		},
-		{
-			"tmpfs-subdir-used-indirectly-via-bindmount-dir-by-one-pod",
-			"/mnt/vol1/foo",
-			base + `177 25 0:46 / /mnt/data rw,relatime shared:37 - tmpfs data rw
-190 25 0:46 /vol1 /mnt/vol1 rw,relatime shared:37 - tmpfs data rw
-191 25 0:46 /vol2 /mnt/vol2 rw,relatime shared:37 - tmpfs data rw
-62 25 0:46 /vol1/foo /var/lib/kubelet/pods/e25f2f01-5b06-11e8-8694-000c29bb0377/volumes/kubernetes.io~local-volume/local-pv-test rw,relatime shared:37 - tmpfs data rw
-`,
-			[]string{"/var/lib/kubelet/pods/e25f2f01-5b06-11e8-8694-000c29bb0377/volumes/kubernetes.io~local-volume/local-pv-test"},
-			nil,
-		},
-		{
-			"dir-bindmounted",
-			"/mnt/disks/vol2",
-			base + `342 25 252:0 /mnt/disks/vol2 /mnt/disks/vol2 rw,relatime shared:1 - ext4 /dev/mapper/ubuntu--vg-root rw,errors=remount-ro,data=ordered
-`,
-			nil,
-			nil,
-		},
-		{
-			"dir-bindmounted-used-by-one-pod",
-			"/mnt/disks/vol2",
-			base + `342 25 252:0 /mnt/disks/vol2 /mnt/disks/vol2 rw,relatime shared:1 - ext4 /dev/mapper/ubuntu--vg-root rw,errors=remount-ro,data=ordered
-77 25 252:0 /mnt/disks/vol2 /var/lib/kubelet/pods/f30dc360-5a5d-11e8-962f-000c29bb0377/volumes/kubernetes.io~local-volume/local-pv-1fb30a1c rw,relatime shared:1 - ext4 /dev/mapper/ubuntu--vg-root rw,errors=remount-ro,data=ordered
-`,
-			[]string{"/var/lib/kubelet/pods/f30dc360-5a5d-11e8-962f-000c29bb0377/volumes/kubernetes.io~local-volume/local-pv-1fb30a1c"},
-			nil,
-		},
-		{
-			"blockfs",
-			"/mnt/disks/blkvol1",
-			base + `58 25 7:1 / /mnt/disks/blkvol1 rw,relatime shared:38 - ext4 /dev/loop1 rw,data=ordered
-`,
-			nil,
-			nil,
-		},
-		{
-			"blockfs-used-by-one-pod",
-			"/mnt/disks/blkvol1",
-			base + `58 25 7:1 / /mnt/disks/blkvol1 rw,relatime shared:38 - ext4 /dev/loop1 rw,data=ordered
-62 25 7:1 / /var/lib/kubelet/pods/f19fe4e2-5a63-11e8-962f-000c29bb0377/volumes/kubernetes.io~local-volume/local-pv-test rw,relatime shared:38 - ext4 /dev/loop1 rw,data=ordered
-`,
-			[]string{"/var/lib/kubelet/pods/f19fe4e2-5a63-11e8-962f-000c29bb0377/volumes/kubernetes.io~local-volume/local-pv-test"},
-			nil,
-		},
-		{
-			"blockfs-used-by-two-pods",
-			"/mnt/disks/blkvol1",
-			base + `58 25 7:1 / /mnt/disks/blkvol1 rw,relatime shared:38 - ext4 /dev/loop1 rw,data=ordered
-62 25 7:1 / /var/lib/kubelet/pods/f19fe4e2-5a63-11e8-962f-000c29bb0377/volumes/kubernetes.io~local-volume/local-pv-test rw,relatime shared:38 - ext4 /dev/loop1 rw,data=ordered
-95 25 7:1 / /var/lib/kubelet/pods/4854a48b-5a64-11e8-962f-000c29bb0377/volumes/kubernetes.io~local-volume/local-pv-test rw,relatime shared:38 - ext4 /dev/loop1 rw,data=ordered
-`,
-			[]string{"/var/lib/kubelet/pods/f19fe4e2-5a63-11e8-962f-000c29bb0377/volumes/kubernetes.io~local-volume/local-pv-test",
-				"/var/lib/kubelet/pods/4854a48b-5a64-11e8-962f-000c29bb0377/volumes/kubernetes.io~local-volume/local-pv-test"},
-			nil,
-		},
-	}
-	tmpFile, err := ioutil.TempFile("", "test-get-filetype")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.Remove(tmpFile.Name())
-	defer tmpFile.Close()
-	for _, v := range testcases {
-		tmpFile.Truncate(0)
-		tmpFile.Seek(0, 0)
-		tmpFile.WriteString(v.mountInfos)
-		tmpFile.Sync()
-		refs, err := SearchMountPoints(v.source, tmpFile.Name())
-		if !reflect.DeepEqual(refs, v.expectedRefs) {
-			t.Errorf("test %q: expected Refs: %#v, got %#v", v.name, v.expectedRefs, refs)
-		}
-		if !reflect.DeepEqual(err, v.expectedErr) {
-			t.Errorf("test %q: expected err: %v, got %v", v.name, v.expectedErr, err)
-		}
-	}
-}

pkg/util/mount/mount_test.go

@@ -1,60 +0,0 @@
-/*
-Copyright 2018 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package mount
-
-import (
-	"reflect"
-	"testing"
-)
-
-func TestMakeBindOpts(t *testing.T) {
-	tests := []struct {
-		mountOption         []string
-		isBind              bool
-		expectedBindOpts    []string
-		expectedRemountOpts []string
-	}{
-		{
-			[]string{"vers=2", "ro", "_netdev"},
-			false,
-			[]string{},
-			[]string{},
-		},
-		{
-
-			[]string{"bind", "vers=2", "ro", "_netdev"},
-			true,
-			[]string{"bind", "_netdev"},
-			[]string{"bind", "remount", "vers=2", "ro", "_netdev"},
-		},
-	}
-	for _, test := range tests {
-		bind, bindOpts, bindRemountOpts := MakeBindOpts(test.mountOption)
-		if bind != test.isBind {
-			t.Errorf("Expected bind to be %v but got %v", test.isBind, bind)
-		}
-		if test.isBind {
-			if !reflect.DeepEqual(test.expectedBindOpts, bindOpts) {
-				t.Errorf("Expected bind mount options to be %+v got %+v", test.expectedBindOpts, bindOpts)
-			}
-			if !reflect.DeepEqual(test.expectedRemountOpts, bindRemountOpts) {
-				t.Errorf("Expected remount options to be %+v got %+v", test.expectedRemountOpts, bindRemountOpts)
-			}
-		}
-
-	}
-}

pkg/util/mount/mount_windows_test.go

@@ -1,333 +0,0 @@
-// +build windows
-
-/*
-Copyright 2017 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package mount
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"k8s.io/utils/exec/testing"
-)
-
-func makeLink(link, target string) error {
-	if output, err := exec.Command("cmd", "/c", "mklink", "/D", link, target).CombinedOutput(); err != nil {
-		return fmt.Errorf("mklink failed: %v, link(%q) target(%q) output: %q", err, link, target, string(output))
-	}
-	return nil
-}
-
-func removeLink(link string) error {
-	if output, err := exec.Command("cmd", "/c", "rmdir", link).CombinedOutput(); err != nil {
-		return fmt.Errorf("rmdir failed: %v, output: %q", err, string(output))
-	}
-	return nil
-}
-
-func setEquivalent(set1, set2 []string) bool {
-	map1 := make(map[string]bool)
-	map2 := make(map[string]bool)
-	for _, s := range set1 {
-		map1[s] = true
-	}
-	for _, s := range set2 {
-		map2[s] = true
-	}
-
-	for s := range map1 {
-		if !map2[s] {
-			return false
-		}
-	}
-	for s := range map2 {
-		if !map1[s] {
-			return false
-		}
-	}
-	return true
-}
-
-// this func must run in admin mode, otherwise it will fail
-func TestGetMountRefs(t *testing.T) {
-	tests := []struct {
-		mountPath    string
-		expectedRefs []string
-	}{
-		{
-			mountPath:    `c:\windows`,
-			expectedRefs: []string{`c:\windows`},
-		},
-		{
-			mountPath:    `c:\doesnotexist`,
-			expectedRefs: []string{},
-		},
-	}
-
-	mounter := Mounter{"fake/path"}
-
-	for _, test := range tests {
-		if refs, err := mounter.GetMountRefs(test.mountPath); err != nil || !setEquivalent(test.expectedRefs, refs) {
-			t.Errorf("getMountRefs(%q) = %v, error: %v; expected %v", test.mountPath, refs, err, test.expectedRefs)
-		}
-	}
-}
-
-func TestPathWithinBase(t *testing.T) {
-	tests := []struct {
-		fullPath       string
-		basePath       string
-		expectedResult bool
-	}{
-		{
-			fullPath:       `c:\tmp\a\b\c`,
-			basePath:       `c:\tmp`,
-			expectedResult: true,
-		},
-		{
-			fullPath:       `c:\tmp1`,
-			basePath:       `c:\tmp2`,
-			expectedResult: false,
-		},
-		{
-			fullPath:       `c:\tmp`,
-			basePath:       `c:\tmp`,
-			expectedResult: true,
-		},
-		{
-			fullPath:       `c:\tmp`,
-			basePath:       `c:\tmp\a\b\c`,
-			expectedResult: false,
-		},
-		{
-			fullPath:       `c:\kubelet\pods\uuid\volumes\kubernetes.io~configmap\config\..timestamp\file.txt`,
-			basePath:       `c:\kubelet\pods\uuid\volumes\kubernetes.io~configmap\config`,
-			expectedResult: true,
-		},
-	}
-
-	for _, test := range tests {
-		result := PathWithinBase(test.fullPath, test.basePath)
-		assert.Equal(t, result, test.expectedResult, "Expect result not equal with PathWithinBase(%s, %s) return: %q, expected: %q",
-			test.fullPath, test.basePath, result, test.expectedResult)
-	}
-}
-
-func TestIsLikelyNotMountPoint(t *testing.T) {
-	mounter := Mounter{"fake/path"}
-
-	tests := []struct {
-		fileName       string
-		targetLinkName string
-		setUp          func(base, fileName, targetLinkName string) error
-		expectedResult bool
-		expectError    bool
-	}{
-		{
-			"Dir",
-			"",
-			func(base, fileName, targetLinkName string) error {
-				return os.Mkdir(filepath.Join(base, fileName), 0750)
-			},
-			true,
-			false,
-		},
-		{
-			"InvalidDir",
-			"",
-			func(base, fileName, targetLinkName string) error {
-				return nil
-			},
-			true,
-			true,
-		},
-		{
-			"ValidSymLink",
-			"targetSymLink",
-			func(base, fileName, targetLinkName string) error {
-				targeLinkPath := filepath.Join(base, targetLinkName)
-				if err := os.Mkdir(targeLinkPath, 0750); err != nil {
-					return err
-				}
-
-				filePath := filepath.Join(base, fileName)
-				if err := makeLink(filePath, targeLinkPath); err != nil {
-					return err
-				}
-				return nil
-			},
-			false,
-			false,
-		},
-		{
-			"InvalidSymLink",
-			"targetSymLink2",
-			func(base, fileName, targetLinkName string) error {
-				targeLinkPath := filepath.Join(base, targetLinkName)
-				if err := os.Mkdir(targeLinkPath, 0750); err != nil {
-					return err
-				}
-
-				filePath := filepath.Join(base, fileName)
-				if err := makeLink(filePath, targeLinkPath); err != nil {
-					return err
-				}
-				return removeLink(targeLinkPath)
-			},
-			true,
-			false,
-		},
-	}
-
-	for _, test := range tests {
-		base, err := ioutil.TempDir("", test.fileName)
-		if err != nil {
-			t.Fatalf(err.Error())
-		}
-
-		defer os.RemoveAll(base)
-
-		if err := test.setUp(base, test.fileName, test.targetLinkName); err != nil {
-			t.Fatalf("unexpected error in setUp(%s, %s): %v", test.fileName, test.targetLinkName, err)
-		}
-
-		filePath := filepath.Join(base, test.fileName)
-		result, err := mounter.IsLikelyNotMountPoint(filePath)
-		assert.Equal(t, result, test.expectedResult, "Expect result not equal with IsLikelyNotMountPoint(%s) return: %q, expected: %q",
-			filePath, result, test.expectedResult)
-
-		if test.expectError {
-			assert.NotNil(t, err, "Expect error during IsLikelyNotMountPoint(%s)", filePath)
-		} else {
-			assert.Nil(t, err, "Expect error is nil during IsLikelyNotMountPoint(%s)", filePath)
-		}
-	}
-}
-
-func TestFormatAndMount(t *testing.T) {
-	tests := []struct {
-		device       string
-		target       string
-		fstype       string
-		execScripts  []ExecArgs
-		mountOptions []string
-		expectError  bool
-	}{
-		{
-			device: "0",
-			target: "disk",
-			fstype: "NTFS",
-			execScripts: []ExecArgs{
-				{"powershell", []string{"/c", "Get-Disk", "-Number"}, "0", nil},
-				{"powershell", []string{"/c", "Get-Partition", "-DiskNumber"}, "0", nil},
-				{"cmd", []string{"/c", "mklink", "/D"}, "", nil},
-			},
-			mountOptions: []string{},
-			expectError:  false,
-		},
-		{
-			device: "0",
-			target: "disk",
-			fstype: "",
-			execScripts: []ExecArgs{
-				{"powershell", []string{"/c", "Get-Disk", "-Number"}, "0", nil},
-				{"powershell", []string{"/c", "Get-Partition", "-DiskNumber"}, "0", nil},
-				{"cmd", []string{"/c", "mklink", "/D"}, "", nil},
-			},
-			mountOptions: []string{},
-			expectError:  false,
-		},
-		{
-			device:       "invalidDevice",
-			target:       "disk",
-			fstype:       "NTFS",
-			mountOptions: []string{},
-			expectError:  true,
-		},
-	}
-
-	for _, test := range tests {
-		fakeMounter := ErrorMounter{NewFakeMounter(nil), 0, nil}
-		fakeExec := &testingexec.FakeExec{}
-		for _, script := range test.execScripts {
-			fakeCmd := &testingexec.FakeCmd{}
-			cmdAction := makeFakeCmd(fakeCmd, script.command, script.args...)
-			outputAction := makeFakeOutput(script.output, script.err)
-			fakeCmd.CombinedOutputScript = append(fakeCmd.CombinedOutputScript, outputAction)
-			fakeExec.CommandScript = append(fakeExec.CommandScript, cmdAction)
-		}
-		mounter := SafeFormatAndMount{
-			Interface: &fakeMounter,
-			Exec:      fakeExec,
-		}
-		base, err := ioutil.TempDir("", test.device)
-		if err != nil {
-			t.Fatalf(err.Error())
-		}
-		defer os.RemoveAll(base)
-
-		target := filepath.Join(base, test.target)
-		err = mounter.FormatAndMount(test.device, target, test.fstype, test.mountOptions)
-		if test.expectError {
-			assert.NotNil(t, err, "Expect error during FormatAndMount(%s, %s, %s, %v)", test.device, test.target, test.fstype, test.mountOptions)
-		} else {
-			assert.Nil(t, err, "Expect error is nil during FormatAndMount(%s, %s, %s, %v)", test.device, test.target, test.fstype, test.mountOptions)
-		}
-	}
-}
-
-func TestNewSMBMapping(t *testing.T) {
-	tests := []struct {
-		username    string
-		password    string
-		remotepath  string
-		expectError bool
-	}{
-		{
-			"",
-			"password",
-			`\\remotepath`,
-			true,
-		},
-		{
-			"username",
-			"",
-			`\\remotepath`,
-			true,
-		},
-		{
-			"username",
-			"password",
-			"",
-			true,
-		},
-	}
-
-	for _, test := range tests {
-		_, err := newSMBMapping(test.username, test.password, test.remotepath)
-		if test.expectError {
-			assert.NotNil(t, err, "Expect error during newSMBMapping(%s, %s, %s, %v)", test.username, test.password, test.remotepath)
-		} else {
-			assert.Nil(t, err, "Expect error is nil during newSMBMapping(%s, %s, %s, %v)", test.username, test.password, test.remotepath)
-		}
-	}
-}

pkg/util/mount/safe_format_and_mount_test.go

@@ -1,248 +0,0 @@
-/*
-Copyright 2014 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package mount
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"runtime"
-	"strings"
-	"testing"
-
-	"k8s.io/utils/exec"
-	"k8s.io/utils/exec/testing"
-)
-
-type ErrorMounter struct {
-	*FakeMounter
-	errIndex int
-	err      []error
-}
-
-func (mounter *ErrorMounter) Mount(source string, target string, fstype string, options []string) error {
-	i := mounter.errIndex
-	mounter.errIndex++
-	if mounter.err != nil && mounter.err[i] != nil {
-		return mounter.err[i]
-	}
-	return mounter.FakeMounter.Mount(source, target, fstype, options)
-}
-
-type ExecArgs struct {
-	command string
-	args    []string
-	output  string
-	err     error
-}
-
-func TestSafeFormatAndMount(t *testing.T) {
-	if runtime.GOOS == "darwin" || runtime.GOOS == "windows" {
-		t.Skipf("not supported on GOOS=%s", runtime.GOOS)
-	}
-	mntDir, err := ioutil.TempDir(os.TempDir(), "mount")
-	if err != nil {
-		t.Fatalf("failed to create tmp dir: %v", err)
-	}
-	defer os.RemoveAll(mntDir)
-	tests := []struct {
-		description   string
-		fstype        string
-		mountOptions  []string
-		execScripts   []ExecArgs
-		mountErrs     []error
-		expectedError error
-	}{
-		{
-			description:  "Test a read only mount",
-			fstype:       "ext4",
-			mountOptions: []string{"ro"},
-		},
-		{
-			description: "Test a normal mount",
-			fstype:      "ext4",
-			execScripts: []ExecArgs{
-				{"fsck", []string{"-a", "/dev/foo"}, "", nil},
-			},
-		},
-		{
-			description: "Test 'fsck' fails with exit status 4",
-			fstype:      "ext4",
-			execScripts: []ExecArgs{
-				{"fsck", []string{"-a", "/dev/foo"}, "", &testingexec.FakeExitError{Status: 4}},
-			},
-			expectedError: fmt.Errorf("'fsck' found errors on device /dev/foo but could not correct them"),
-		},
-		{
-			description: "Test 'fsck' fails with exit status 1 (errors found and corrected)",
-			fstype:      "ext4",
-			execScripts: []ExecArgs{
-				{"fsck", []string{"-a", "/dev/foo"}, "", &testingexec.FakeExitError{Status: 1}},
-			},
-		},
-		{
-			description: "Test 'fsck' fails with exit status other than 1 and 4 (likely unformatted device)",
-			fstype:      "ext4",
-			execScripts: []ExecArgs{
-				{"fsck", []string{"-a", "/dev/foo"}, "", &testingexec.FakeExitError{Status: 8}},
-			},
-		},
-		{
-			description: "Test that 'blkid' is called and fails",
-			fstype:      "ext4",
-			mountErrs:   []error{fmt.Errorf("unknown filesystem type '(null)'")},
-			execScripts: []ExecArgs{
-				{"fsck", []string{"-a", "/dev/foo"}, "", nil},
-				{"blkid", []string{"-p", "-s", "TYPE", "-s", "PTTYPE", "-o", "export", "/dev/foo"}, "DEVNAME=/dev/foo\nTYPE=ext4\n", nil},
-			},
-			expectedError: fmt.Errorf("unknown filesystem type '(null)'"),
-		},
-		{
-			description: "Test that 'blkid' is called and confirms unformatted disk, format fails",
-			fstype:      "ext4",
-			mountErrs:   []error{fmt.Errorf("unknown filesystem type '(null)'")},
-			execScripts: []ExecArgs{
-				{"fsck", []string{"-a", "/dev/foo"}, "", nil},
-				{"blkid", []string{"-p", "-s", "TYPE", "-s", "PTTYPE", "-o", "export", "/dev/foo"}, "", &testingexec.FakeExitError{Status: 2}},
-				{"mkfs.ext4", []string{"-F", "-m0", "/dev/foo"}, "", fmt.Errorf("formatting failed")},
-			},
-			expectedError: fmt.Errorf("formatting failed"),
-		},
-		{
-			description: "Test that 'blkid' is called and confirms unformatted disk, format passes, second mount fails",
-			fstype:      "ext4",
-			mountErrs:   []error{fmt.Errorf("unknown filesystem type '(null)'"), fmt.Errorf("Still cannot mount")},
-			execScripts: []ExecArgs{
-				{"fsck", []string{"-a", "/dev/foo"}, "", nil},
-				{"blkid", []string{"-p", "-s", "TYPE", "-s", "PTTYPE", "-o", "export", "/dev/foo"}, "", &testingexec.FakeExitError{Status: 2}},
-				{"mkfs.ext4", []string{"-F", "-m0", "/dev/foo"}, "", nil},
-			},
-			expectedError: fmt.Errorf("Still cannot mount"),
-		},
-		{
-			description: "Test that 'blkid' is called and confirms unformatted disk, format passes, second mount passes",
-			fstype:      "ext4",
-			mountErrs:   []error{fmt.Errorf("unknown filesystem type '(null)'"), nil},
-			execScripts: []ExecArgs{
-				{"fsck", []string{"-a", "/dev/foo"}, "", nil},
-				{"blkid", []string{"-p", "-s", "TYPE", "-s", "PTTYPE", "-o", "export", "/dev/foo"}, "", &testingexec.FakeExitError{Status: 2}},
-				{"mkfs.ext4", []string{"-F", "-m0", "/dev/foo"}, "", nil},
-			},
-			expectedError: nil,
-		},
-		{
-			description: "Test that 'blkid' is called and confirms unformatted disk, format passes, second mount passes with ext3",
-			fstype:      "ext3",
-			mountErrs:   []error{fmt.Errorf("unknown filesystem type '(null)'"), nil},
-			execScripts: []ExecArgs{
-				{"fsck", []string{"-a", "/dev/foo"}, "", nil},
-				{"blkid", []string{"-p", "-s", "TYPE", "-s", "PTTYPE", "-o", "export", "/dev/foo"}, "", &testingexec.FakeExitError{Status: 2}},
-				{"mkfs.ext3", []string{"-F", "-m0", "/dev/foo"}, "", nil},
-			},
-			expectedError: nil,
-		},
-		{
-			description: "test that none ext4 fs does not get called with ext4 options.",
-			fstype:      "xfs",
-			mountErrs:   []error{fmt.Errorf("unknown filesystem type '(null)'"), nil},
-			execScripts: []ExecArgs{
-				{"fsck", []string{"-a", "/dev/foo"}, "", nil},
-				{"blkid", []string{"-p", "-s", "TYPE", "-s", "PTTYPE", "-o", "export", "/dev/foo"}, "", &testingexec.FakeExitError{Status: 2}},
-				{"mkfs.xfs", []string{"/dev/foo"}, "", nil},
-			},
-			expectedError: nil,
-		},
-		{
-			description: "Test that 'blkid' is called and reports ext4 partition",
-			fstype:      "ext3",
-			mountErrs:   []error{fmt.Errorf("unknown filesystem type '(null)'")},
-			execScripts: []ExecArgs{
-				{"fsck", []string{"-a", "/dev/foo"}, "", nil},
-				{"blkid", []string{"-p", "-s", "TYPE", "-s", "PTTYPE", "-o", "export", "/dev/foo"}, "DEVNAME=/dev/foo\nPTTYPE=dos\n", nil},
-			},
-			expectedError: fmt.Errorf("failed to mount the volume as \"ext3\", it already contains unknown data, probably partitions. Mount error: unknown filesystem type '(null)'"),
-		},
-		{
-			description: "Test that 'blkid' is called but has some usage or other errors (an exit code of 4 is returned)",
-			fstype:      "xfs",
-			mountErrs:   []error{fmt.Errorf("unknown filesystem type '(null)'"), nil},
-			execScripts: []ExecArgs{
-				{"fsck", []string{"-a", "/dev/foo"}, "", nil},
-				{"blkid", []string{"-p", "-s", "TYPE", "-s", "PTTYPE", "-o", "export", "/dev/foo"}, "", &testingexec.FakeExitError{Status: 4}},
-				{"mkfs.xfs", []string{"/dev/foo"}, "", nil},
-			},
-			expectedError: fmt.Errorf("exit 4"),
-		},
-	}
-
-	for _, test := range tests {
-		fakeMounter := ErrorMounter{NewFakeMounter(nil), 0, test.mountErrs}
-		fakeExec := &testingexec.FakeExec{ExactOrder: true}
-		for _, script := range test.execScripts {
-			fakeCmd := &testingexec.FakeCmd{}
-			cmdAction := makeFakeCmd(fakeCmd, script.command, script.args...)
-			outputAction := makeFakeOutput(script.output, script.err)
-			fakeCmd.CombinedOutputScript = append(fakeCmd.CombinedOutputScript, outputAction)
-			fakeExec.CommandScript = append(fakeExec.CommandScript, cmdAction)
-		}
-		mounter := SafeFormatAndMount{
-			Interface: &fakeMounter,
-			Exec:      fakeExec,
-		}
-
-		device := "/dev/foo"
-		dest := mntDir
-		err := mounter.FormatAndMount(device, dest, test.fstype, test.mountOptions)
-		if test.expectedError == nil {
-			if err != nil {
-				t.Errorf("test \"%s\" unexpected non-error: %v", test.description, err)
-			}
-
-			// Check that something was mounted on the directory
-			isNotMountPoint, err := fakeMounter.IsLikelyNotMountPoint(dest)
-			if err != nil || isNotMountPoint {
-				t.Errorf("test \"%s\" the directory was not mounted", test.description)
-			}
-
-			//check that the correct device was mounted
-			mountedDevice, _, err := GetDeviceNameFromMount(fakeMounter.FakeMounter, dest)
-			if err != nil || mountedDevice != device {
-				t.Errorf("test \"%s\" the correct device was not mounted", test.description)
-			}
-		} else {
-			if err == nil || !strings.HasPrefix(err.Error(), test.expectedError.Error()) {
-				t.Errorf("test \"%s\" unexpected error: \n          [%v]. \nExpecting [%v]", test.description, err, test.expectedError)
-			}
-		}
-	}
-}
-
-func makeFakeCmd(fakeCmd *testingexec.FakeCmd, cmd string, args ...string) testingexec.FakeCommandAction {
-	c := cmd
-	a := args
-	return func(cmd string, args ...string) exec.Cmd {
-		command := testingexec.InitFakeCmd(fakeCmd, c, a...)
-		return command
-	}
-}
-
-func makeFakeOutput(output string, err error) testingexec.FakeCombinedOutputAction {
-	o := output
-	return func() ([]byte, error) {
-		return []byte(o), err
-	}
-}

pkg/util/removeall/BUILD

@@ -11,8 +11,8 @@ go_test(
     srcs = ["removeall_test.go"],
     embed = [":go_default_library"],
     deps = [
-        "//pkg/util/mount:go_default_library",
         "//staging/src/k8s.io/client-go/util/testing:go_default_library",
+        "//vendor/k8s.io/utils/mount:go_default_library",
     ],
 )
 
@@ -20,7 +20,7 @@ go_library(
     name = "go_default_library",
     srcs = ["removeall.go"],
     importpath = "k8s.io/kubernetes/pkg/util/removeall",
-    deps = ["//pkg/util/mount:go_default_library"],
+    deps = ["//vendor/k8s.io/utils/mount:go_default_library"],
 )
 
 filegroup(

pkg/util/removeall/removeall.go

@@ -22,7 +22,7 @@ import (
 	"os"
 	"syscall"
 
-	"k8s.io/kubernetes/pkg/util/mount"
+	"k8s.io/utils/mount"
 )
 
 // RemoveAllOneFilesystem removes path and any children it contains.

pkg/util/removeall/removeall_test.go

@@ -24,7 +24,7 @@ import (
 	"testing"
 
 	utiltesting "k8s.io/client-go/util/testing"
-	"k8s.io/kubernetes/pkg/util/mount"
+	"k8s.io/utils/mount"
 )
 
 type fakeMounter struct {

pkg/util/resizefs/BUILD

@@ -10,42 +10,42 @@ go_library(
     visibility = ["//visibility:public"],
     deps = select({
         "@io_bazel_rules_go//go/platform:android": [
-            "//pkg/util/mount:go_default_library",
             "//vendor/k8s.io/klog:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
         ],
         "@io_bazel_rules_go//go/platform:darwin": [
-            "//pkg/util/mount:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
         ],
         "@io_bazel_rules_go//go/platform:dragonfly": [
-            "//pkg/util/mount:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
         ],
         "@io_bazel_rules_go//go/platform:freebsd": [
-            "//pkg/util/mount:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
         ],
         "@io_bazel_rules_go//go/platform:ios": [
-            "//pkg/util/mount:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
         ],
         "@io_bazel_rules_go//go/platform:linux": [
-            "//pkg/util/mount:go_default_library",
             "//vendor/k8s.io/klog:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
         ],
         "@io_bazel_rules_go//go/platform:nacl": [
-            "//pkg/util/mount:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
         ],
         "@io_bazel_rules_go//go/platform:netbsd": [
-            "//pkg/util/mount:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
         ],
         "@io_bazel_rules_go//go/platform:openbsd": [
-            "//pkg/util/mount:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
         ],
         "@io_bazel_rules_go//go/platform:plan9": [
-            "//pkg/util/mount:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
         ],
         "@io_bazel_rules_go//go/platform:solaris": [
-            "//pkg/util/mount:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
         ],
         "@io_bazel_rules_go//go/platform:windows": [
-            "//pkg/util/mount:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
         ],
         "//conditions:default": [],
     }),

pkg/util/resizefs/resizefs_linux.go

@@ -22,7 +22,7 @@ import (
 	"fmt"
 
 	"k8s.io/klog"
-	"k8s.io/kubernetes/pkg/util/mount"
+	"k8s.io/utils/mount"
 )
 
 // ResizeFs Provides support for resizing file systems

pkg/util/resizefs/resizefs_unsupported.go

@@ -21,7 +21,7 @@ package resizefs
 import (
 	"fmt"
 
-	"k8s.io/kubernetes/pkg/util/mount"
+	"k8s.io/utils/mount"
 )
 
 // ResizeFs Provides support for resizing file systems

pkg/volume/BUILD

@@ -19,7 +19,6 @@ go_library(
     visibility = ["//visibility:public"],
     deps = [
         "//pkg/features:go_default_library",
-        "//pkg/util/mount:go_default_library",
         "//pkg/volume/util/fs:go_default_library",
         "//pkg/volume/util/hostutil:go_default_library",
         "//pkg/volume/util/recyclerclient:go_default_library",
@@ -41,6 +40,7 @@ go_library(
         "//staging/src/k8s.io/cloud-provider:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
         "//vendor/k8s.io/utils/exec:go_default_library",
+        "//vendor/k8s.io/utils/mount:go_default_library",
     ],
 )
 

pkg/volume/awsebs/BUILD

@@ -21,7 +21,6 @@ go_library(
     importpath = "k8s.io/kubernetes/pkg/volume/awsebs",
     deps = [
         "//pkg/features:go_default_library",
-        "//pkg/util/mount:go_default_library",
         "//pkg/volume:go_default_library",
         "//pkg/volume/util:go_default_library",
         "//pkg/volume/util/volumepathhandler:go_default_library",
@@ -35,6 +34,7 @@ go_library(
         "//staging/src/k8s.io/cloud-provider/volume/helpers:go_default_library",
         "//staging/src/k8s.io/legacy-cloud-providers/aws:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
+        "//vendor/k8s.io/utils/mount:go_default_library",
         "//vendor/k8s.io/utils/strings:go_default_library",
     ],
 )
@@ -48,7 +48,6 @@ go_test(
     ],
     embed = [":go_default_library"],
     deps = [
-        "//pkg/util/mount:go_default_library",
         "//pkg/volume:go_default_library",
         "//pkg/volume/testing:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
@@ -61,6 +60,7 @@ go_test(
         "//staging/src/k8s.io/legacy-cloud-providers/aws:go_default_library",
         "//vendor/github.com/stretchr/testify/assert:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
+        "//vendor/k8s.io/utils/mount:go_default_library",
     ],
 )
 

pkg/volume/awsebs/attacher.go

@@ -28,10 +28,10 @@ import (
 	"time"
 
 	"k8s.io/klog"
+	"k8s.io/utils/mount"
 
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume"
 	volumeutil "k8s.io/kubernetes/pkg/volume/util"
 	"k8s.io/legacy-cloud-providers/aws"

pkg/volume/awsebs/aws_ebs.go

@@ -29,6 +29,7 @@ import (
 	"strings"
 
 	"k8s.io/klog"
+	"k8s.io/utils/mount"
 
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
@@ -36,7 +37,6 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	utilfeature "k8s.io/apiserver/pkg/util/feature"
 	"k8s.io/kubernetes/pkg/features"
-	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume"
 	"k8s.io/kubernetes/pkg/volume/util"
 	"k8s.io/legacy-cloud-providers/aws"

pkg/volume/awsebs/aws_ebs_block.go

@@ -24,14 +24,15 @@ import (
 	"strconv"
 	"strings"
 
+	"k8s.io/klog"
+	"k8s.io/utils/mount"
+	utilstrings "k8s.io/utils/strings"
+
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/klog"
-	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume"
 	"k8s.io/kubernetes/pkg/volume/util/volumepathhandler"
 	"k8s.io/legacy-cloud-providers/aws"
-	utilstrings "k8s.io/utils/strings"
 )
 
 var _ volume.BlockVolumePlugin = &awsElasticBlockStorePlugin{}

pkg/volume/awsebs/aws_ebs_test.go

@@ -26,13 +26,14 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"k8s.io/utils/mount"
+
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/client-go/kubernetes/fake"
 	utiltesting "k8s.io/client-go/util/testing"
-	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume"
 	volumetest "k8s.io/kubernetes/pkg/volume/testing"
 	"k8s.io/legacy-cloud-providers/aws"

pkg/volume/awsebs/aws_util.go

@@ -27,6 +27,7 @@ import (
 	"time"
 
 	"k8s.io/klog"
+	"k8s.io/utils/mount"
 
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
@@ -34,7 +35,6 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 	cloudprovider "k8s.io/cloud-provider"
 	volumehelpers "k8s.io/cloud-provider/volume/helpers"
-	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume"
 	volumeutil "k8s.io/kubernetes/pkg/volume/util"
 	"k8s.io/legacy-cloud-providers/aws"

pkg/volume/azure_dd/BUILD

@@ -25,7 +25,6 @@ go_library(
     deps = [
         "//pkg/apis/core:go_default_library",
         "//pkg/features:go_default_library",
-        "//pkg/util/mount:go_default_library",
         "//pkg/volume:go_default_library",
         "//pkg/volume/util:go_default_library",
         "//pkg/volume/util/volumepathhandler:go_default_library",
@@ -42,6 +41,7 @@ go_library(
         "//vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-07-01/compute:go_default_library",
         "//vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2019-04-01/storage:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
+        "//vendor/k8s.io/utils/mount:go_default_library",
         "//vendor/k8s.io/utils/strings:go_default_library",
     ] + select({
         "@io_bazel_rules_go//go/platform:android": [

pkg/volume/azure_dd/attacher.go

@@ -29,12 +29,12 @@ import (
 
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-07-01/compute"
 	"k8s.io/klog"
+	"k8s.io/utils/mount"
 
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/wait"
 	cloudprovider "k8s.io/cloud-provider"
-	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume"
 	"k8s.io/kubernetes/pkg/volume/util"
 	"k8s.io/legacy-cloud-providers/azure"

pkg/volume/azure_dd/azure_common_windows.go

@@ -27,8 +27,7 @@ import (
 
 	"k8s.io/klog"
 	utilexec "k8s.io/utils/exec"
-
+	"k8s.io/utils/mount"
-	"k8s.io/kubernetes/pkg/util/mount"
 )
 
 func scsiHostRescan(io ioHandler, exec utilexec.Interface) {

pkg/volume/azure_dd/azure_dd_block.go

@@ -22,14 +22,15 @@ import (
 	"fmt"
 	"path/filepath"
 
-	"k8s.io/api/core/v1"
+	"k8s.io/klog"
+	"k8s.io/utils/mount"
+	utilstrings "k8s.io/utils/strings"
+
+	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/klog"
-	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume"
 	"k8s.io/kubernetes/pkg/volume/util/volumepathhandler"
-	utilstrings "k8s.io/utils/strings"
 )
 
 var _ volume.VolumePlugin = &azureDataDiskPlugin{}

pkg/volume/azure_dd/azure_mounter.go

@@ -23,9 +23,10 @@ import (
 	"os"
 	"runtime"
 
-	"k8s.io/api/core/v1"
 	"k8s.io/klog"
-	"k8s.io/kubernetes/pkg/util/mount"
+	"k8s.io/utils/mount"
+
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/kubernetes/pkg/volume"
 	"k8s.io/kubernetes/pkg/volume/util"
 )

pkg/volume/azure_file/BUILD

@@ -1,10 +1,4 @@
-package(default_visibility = ["//visibility:public"])
+load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
-
-load(
-    "@io_bazel_rules_go//go:def.bzl",
-    "go_library",
-    "go_test",
-)
 
 go_library(
     name = "go_default_library",
@@ -15,8 +9,8 @@ go_library(
         "doc.go",
     ],
     importpath = "k8s.io/kubernetes/pkg/volume/azure_file",
+    visibility = ["//visibility:public"],
     deps = [
-        "//pkg/util/mount:go_default_library",
         "//pkg/volume:go_default_library",
         "//pkg/volume/util:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
@@ -29,6 +23,7 @@ go_library(
         "//staging/src/k8s.io/legacy-cloud-providers/azure:go_default_library",
         "//vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2019-04-01/storage:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
+        "//vendor/k8s.io/utils/mount:go_default_library",
         "//vendor/k8s.io/utils/strings:go_default_library",
     ],
 )
@@ -38,7 +33,6 @@ go_test(
     srcs = ["azure_file_test.go"],
     embed = [":go_default_library"],
     deps = [
-        "//pkg/util/mount:go_default_library",
         "//pkg/volume:go_default_library",
         "//pkg/volume/testing:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
@@ -48,6 +42,7 @@ go_test(
         "//staging/src/k8s.io/cloud-provider/fake:go_default_library",
         "//staging/src/k8s.io/legacy-cloud-providers/azure:go_default_library",
         "//vendor/github.com/Azure/go-autorest/autorest/to:go_default_library",
+        "//vendor/k8s.io/utils/mount:go_default_library",
     ],
 )
 
@@ -62,4 +57,5 @@ filegroup(
     name = "all-srcs",
     srcs = [":package-srcs"],
     tags = ["automanaged"],
+    visibility = ["//visibility:public"],
 )

pkg/volume/azure_file/azure_file.go

@@ -24,18 +24,19 @@ import (
 	"os"
 	"runtime"
 
+	"k8s.io/klog"
+	"k8s.io/utils/mount"
+	utilstrings "k8s.io/utils/strings"
+
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	cloudprovider "k8s.io/cloud-provider"
 	volumehelpers "k8s.io/cloud-provider/volume/helpers"
-	"k8s.io/klog"
-	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume"
 	volutil "k8s.io/kubernetes/pkg/volume/util"
 	"k8s.io/legacy-cloud-providers/azure"
-	utilstrings "k8s.io/utils/strings"
 )
 
 // ProbeVolumePlugins is the primary endpoint for volume plugins

pkg/volume/azure_file/azure_file_test.go

@@ -33,7 +33,8 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/kubernetes/fake"
 	fakecloud "k8s.io/cloud-provider/fake"
-	"k8s.io/kubernetes/pkg/util/mount"
+	"k8s.io/utils/mount"
+
 	"k8s.io/kubernetes/pkg/volume"
 	volumetest "k8s.io/kubernetes/pkg/volume/testing"
 	"k8s.io/legacy-cloud-providers/azure"

pkg/volume/cephfs/BUILD

@@ -14,13 +14,13 @@ go_library(
     ],
     importpath = "k8s.io/kubernetes/pkg/volume/cephfs",
     deps = [
-        "//pkg/util/mount:go_default_library",
         "//pkg/volume:go_default_library",
         "//pkg/volume/util:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
+        "//vendor/k8s.io/utils/mount:go_default_library",
         "//vendor/k8s.io/utils/strings:go_default_library",
     ],
 )
@@ -30,12 +30,12 @@ go_test(
     srcs = ["cephfs_test.go"],
     embed = [":go_default_library"],
     deps = [
-        "//pkg/util/mount:go_default_library",
         "//pkg/volume:go_default_library",
         "//pkg/volume/testing:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
         "//staging/src/k8s.io/client-go/util/testing:go_default_library",
+        "//vendor/k8s.io/utils/mount:go_default_library",
     ],
 )
 

pkg/volume/cephfs/cephfs.go

@@ -24,14 +24,15 @@ import (
 	"runtime"
 	"strings"
 
+	"k8s.io/klog"
+	"k8s.io/utils/mount"
+	utilstrings "k8s.io/utils/strings"
+
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/klog"
-	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume"
 	"k8s.io/kubernetes/pkg/volume/util"
-	utilstrings "k8s.io/utils/strings"
 )
 
 // ProbeVolumePlugins is the primary entrypoint for volume plugins.

pkg/volume/cephfs/cephfs_test.go

@@ -21,10 +21,11 @@ import (
 	"path/filepath"
 	"testing"
 
+	"k8s.io/utils/mount"
+
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 	utiltesting "k8s.io/client-go/util/testing"
-	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume"
 	volumetest "k8s.io/kubernetes/pkg/volume/testing"
 )

pkg/volume/cinder/BUILD

@@ -18,7 +18,6 @@ go_library(
     importpath = "k8s.io/kubernetes/pkg/volume/cinder",
     deps = [
         "//pkg/features:go_default_library",
-        "//pkg/util/mount:go_default_library",
         "//pkg/volume:go_default_library",
         "//pkg/volume/util:go_default_library",
         "//pkg/volume/util/volumepathhandler:go_default_library",
@@ -36,6 +35,7 @@ go_library(
         "//vendor/k8s.io/klog:go_default_library",
         "//vendor/k8s.io/utils/exec:go_default_library",
         "//vendor/k8s.io/utils/keymutex:go_default_library",
+        "//vendor/k8s.io/utils/mount:go_default_library",
         "//vendor/k8s.io/utils/strings:go_default_library",
     ],
 )
@@ -49,7 +49,6 @@ go_test(
     ],
     embed = [":go_default_library"],
     deps = [
-        "//pkg/util/mount:go_default_library",
         "//pkg/volume:go_default_library",
         "//pkg/volume/testing:go_default_library",
         "//pkg/volume/util:go_default_library",
@@ -61,6 +60,7 @@ go_test(
         "//staging/src/k8s.io/cloud-provider:go_default_library",
         "//staging/src/k8s.io/legacy-cloud-providers/openstack:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
+        "//vendor/k8s.io/utils/mount:go_default_library",
     ],
 )
 

pkg/volume/cinder/attacher.go

@@ -26,11 +26,12 @@ import (
 	"strings"
 	"time"
 
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/klog"
-	"k8s.io/kubernetes/pkg/util/mount"
+	"k8s.io/utils/mount"
+
 	"k8s.io/kubernetes/pkg/volume"
 	volumeutil "k8s.io/kubernetes/pkg/volume/util"
 )

pkg/volume/cinder/cinder.go

@@ -25,20 +25,21 @@ import (
 	"path"
 	"path/filepath"
 
+	"k8s.io/klog"
+	"k8s.io/utils/keymutex"
+	"k8s.io/utils/mount"
+	utilstrings "k8s.io/utils/strings"
+
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	utilfeature "k8s.io/apiserver/pkg/util/feature"
 	cloudprovider "k8s.io/cloud-provider"
-	"k8s.io/klog"
 	"k8s.io/kubernetes/pkg/features"
-	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume"
 	"k8s.io/kubernetes/pkg/volume/util"
 	"k8s.io/legacy-cloud-providers/openstack"
-	"k8s.io/utils/keymutex"
-	utilstrings "k8s.io/utils/strings"
 )
 
 const (

pkg/volume/cinder/cinder_block.go

@@ -22,14 +22,15 @@ import (
 	"fmt"
 	"path/filepath"
 
+	"k8s.io/klog"
+	"k8s.io/utils/mount"
+	utilstrings "k8s.io/utils/strings"
+
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/klog"
-	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume"
 	"k8s.io/kubernetes/pkg/volume/util/volumepathhandler"
-	utilstrings "k8s.io/utils/strings"
 )
 
 var _ volume.VolumePlugin = &cinderPlugin{}

pkg/volume/cinder/cinder_test.go

@@ -28,7 +28,8 @@ import (
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 	utiltesting "k8s.io/client-go/util/testing"
-	"k8s.io/kubernetes/pkg/util/mount"
+	"k8s.io/utils/mount"
+
 	"k8s.io/kubernetes/pkg/volume"
 	volumetest "k8s.io/kubernetes/pkg/volume/testing"
 	"k8s.io/kubernetes/pkg/volume/util"

pkg/volume/configmap/BUILD

@@ -14,7 +14,6 @@ go_library(
     ],
     importpath = "k8s.io/kubernetes/pkg/volume/configmap",
     deps = [
-        "//pkg/util/mount:go_default_library",
         "//pkg/volume:go_default_library",
         "//pkg/volume/util:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
@@ -22,6 +21,7 @@ go_library(
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
+        "//vendor/k8s.io/utils/mount:go_default_library",
         "//vendor/k8s.io/utils/strings:go_default_library",
     ],
 )

pkg/volume/configmap/configmap.go

@@ -19,15 +19,16 @@ package configmap
 import (
 	"fmt"
 
-	"k8s.io/api/core/v1"
+	"k8s.io/klog"
+	"k8s.io/utils/mount"
+	utilstrings "k8s.io/utils/strings"
+
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/klog"
-	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume"
 	volumeutil "k8s.io/kubernetes/pkg/volume/util"
-	utilstrings "k8s.io/utils/strings"
 )
 
 // ProbeVolumePlugins is the entry point for plugin detection in a package.

pkg/volume/emptydir/BUILD

@@ -17,7 +17,6 @@ go_library(
     importpath = "k8s.io/kubernetes/pkg/volume/emptydir",
     deps = [
         "//pkg/apis/core/v1/helper:go_default_library",
-        "//pkg/util/mount:go_default_library",
         "//pkg/volume:go_default_library",
         "//pkg/volume/util:go_default_library",
         "//pkg/volume/util/fsquota:go_default_library",
@@ -26,6 +25,7 @@ go_library(
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
+        "//vendor/k8s.io/utils/mount:go_default_library",
         "//vendor/k8s.io/utils/strings:go_default_library",
     ] + select({
         "@io_bazel_rules_go//go/platform:android": [
@@ -44,7 +44,6 @@ go_test(
     embed = [":go_default_library"],
     deps = select({
         "@io_bazel_rules_go//go/platform:android": [
-            "//pkg/util/mount:go_default_library",
             "//pkg/volume:go_default_library",
             "//pkg/volume/testing:go_default_library",
             "//pkg/volume/util:go_default_library",
@@ -53,9 +52,9 @@ go_test(
             "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
             "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
             "//staging/src/k8s.io/client-go/util/testing:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
         ],
         "@io_bazel_rules_go//go/platform:linux": [
-            "//pkg/util/mount:go_default_library",
             "//pkg/volume:go_default_library",
             "//pkg/volume/testing:go_default_library",
             "//pkg/volume/util:go_default_library",
@@ -64,6 +63,7 @@ go_test(
             "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
             "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
             "//staging/src/k8s.io/client-go/util/testing:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
         ],
         "//conditions:default": [],
     }),

pkg/volume/emptydir/empty_dir.go

@@ -21,17 +21,18 @@ import (
 	"os"
 	"path/filepath"
 
+	"k8s.io/klog"
+	"k8s.io/utils/mount"
+	utilstrings "k8s.io/utils/strings"
+
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/klog"
 	v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
-	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume"
 	volumeutil "k8s.io/kubernetes/pkg/volume/util"
 	"k8s.io/kubernetes/pkg/volume/util/fsquota"
-	utilstrings "k8s.io/utils/strings"
 )
 
 // TODO: in the near future, this will be changed to be more restrictive

pkg/volume/emptydir/empty_dir_linux.go

@@ -23,9 +23,9 @@ import (
 
 	"golang.org/x/sys/unix"
 	"k8s.io/klog"
+	"k8s.io/utils/mount"
 
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
-	"k8s.io/kubernetes/pkg/util/mount"
 )
 
 // Defined by Linux - the type number for tmpfs mounts.

pkg/volume/emptydir/empty_dir_test.go

@@ -23,12 +23,13 @@ import (
 	"path/filepath"
 	"testing"
 
+	"k8s.io/utils/mount"
+
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	utiltesting "k8s.io/client-go/util/testing"
-	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume"
 	volumetest "k8s.io/kubernetes/pkg/volume/testing"
 	"k8s.io/kubernetes/pkg/volume/util"

pkg/volume/emptydir/empty_dir_unsupported.go

@@ -19,8 +19,9 @@ limitations under the License.
 package emptydir
 
 import (
-	"k8s.io/api/core/v1"
+	"k8s.io/utils/mount"
-	"k8s.io/kubernetes/pkg/util/mount"
+
+	v1 "k8s.io/api/core/v1"
 )
 
 // realMountDetector pretends to implement mediumer.

pkg/volume/fc/BUILD

@@ -18,7 +18,6 @@ go_library(
     importpath = "k8s.io/kubernetes/pkg/volume/fc",
     deps = [
         "//pkg/features:go_default_library",
-        "//pkg/util/mount:go_default_library",
         "//pkg/volume:go_default_library",
         "//pkg/volume/util:go_default_library",
         "//pkg/volume/util/volumepathhandler:go_default_library",
@@ -28,6 +27,7 @@ go_library(
         "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
         "//vendor/k8s.io/utils/exec:go_default_library",
+        "//vendor/k8s.io/utils/mount:go_default_library",
         "//vendor/k8s.io/utils/strings:go_default_library",
     ],
 )
@@ -40,7 +40,6 @@ go_test(
     ],
     embed = [":go_default_library"],
     deps = [
-        "//pkg/util/mount:go_default_library",
         "//pkg/volume:go_default_library",
         "//pkg/volume/testing:go_default_library",
         "//pkg/volume/util:go_default_library",
@@ -50,6 +49,7 @@ go_test(
         "//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library",
         "//staging/src/k8s.io/client-go/util/testing:go_default_library",
         "//vendor/k8s.io/utils/exec/testing:go_default_library",
+        "//vendor/k8s.io/utils/mount:go_default_library",
     ],
 )
 

pkg/volume/fc/attacher.go

@@ -23,12 +23,13 @@ import (
 	"strings"
 	"time"
 
-	"k8s.io/api/core/v1"
+	"k8s.io/klog"
+	"k8s.io/utils/mount"
+
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 	utilfeature "k8s.io/apiserver/pkg/util/feature"
-	"k8s.io/klog"
 	"k8s.io/kubernetes/pkg/features"
-	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume"
 	volumeutil "k8s.io/kubernetes/pkg/volume/util"
 )

pkg/volume/fc/disk_manager.go

@@ -20,7 +20,8 @@ import (
 	"os"
 
 	"k8s.io/klog"
-	"k8s.io/kubernetes/pkg/util/mount"
+	"k8s.io/utils/mount"
+
 	"k8s.io/kubernetes/pkg/volume"
 	"k8s.io/kubernetes/pkg/volume/util"
 )

pkg/volume/fc/fc.go

@@ -23,19 +23,19 @@ import (
 	"strconv"
 	"strings"
 
-	"k8s.io/api/core/v1"
+	"k8s.io/klog"
+	utilexec "k8s.io/utils/exec"
+	"k8s.io/utils/mount"
+	utilstrings "k8s.io/utils/strings"
+
+	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	utilfeature "k8s.io/apiserver/pkg/util/feature"
-	"k8s.io/klog"
-	utilexec "k8s.io/utils/exec"
-
 	"k8s.io/kubernetes/pkg/features"
-	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume"
 	"k8s.io/kubernetes/pkg/volume/util"
 	"k8s.io/kubernetes/pkg/volume/util/volumepathhandler"
-	utilstrings "k8s.io/utils/strings"
 )
 
 // ProbeVolumePlugins is the primary entrypoint for volume plugins.

pkg/volume/fc/fc_test.go

@@ -24,14 +24,14 @@ import (
 	"strings"
 	"testing"
 
+	"k8s.io/utils/exec/testing"
+	"k8s.io/utils/mount"
+
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/kubernetes/fake"
 	utiltesting "k8s.io/client-go/util/testing"
-	"k8s.io/utils/exec/testing"
-
-	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume"
 	volumetest "k8s.io/kubernetes/pkg/volume/testing"
 )

pkg/volume/fc/fc_util.go

@@ -24,11 +24,12 @@ import (
 	"strconv"
 	"strings"
 
-	"k8s.io/api/core/v1"
-	utilfeature "k8s.io/apiserver/pkg/util/feature"
 	"k8s.io/klog"
+	"k8s.io/utils/mount"
+
+	v1 "k8s.io/api/core/v1"
+	utilfeature "k8s.io/apiserver/pkg/util/feature"
 	"k8s.io/kubernetes/pkg/features"
-	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume"
 	volumeutil "k8s.io/kubernetes/pkg/volume/util"
 )

pkg/volume/flexvolume/BUILD

@@ -30,7 +30,6 @@ go_library(
     importpath = "k8s.io/kubernetes/pkg/volume/flexvolume",
     deps = [
         "//pkg/util/filesystem:go_default_library",
-        "//pkg/util/mount:go_default_library",
         "//pkg/volume:go_default_library",
         "//pkg/volume/util:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
@@ -40,6 +39,7 @@ go_library(
         "//vendor/github.com/fsnotify/fsnotify:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
         "//vendor/k8s.io/utils/exec:go_default_library",
+        "//vendor/k8s.io/utils/mount:go_default_library",
         "//vendor/k8s.io/utils/strings:go_default_library",
     ],
 )
@@ -60,7 +60,6 @@ go_test(
     embed = [":go_default_library"],
     deps = [
         "//pkg/util/filesystem:go_default_library",
-        "//pkg/util/mount:go_default_library",
         "//pkg/volume:go_default_library",
         "//pkg/volume/testing:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
@@ -72,6 +71,7 @@ go_test(
         "//vendor/github.com/stretchr/testify/assert:go_default_library",
         "//vendor/k8s.io/utils/exec:go_default_library",
         "//vendor/k8s.io/utils/exec/testing:go_default_library",
+        "//vendor/k8s.io/utils/mount:go_default_library",
     ],
 )
 

pkg/volume/flexvolume/attacher-defaults.go

@@ -20,9 +20,9 @@ import (
 	"time"
 
 	"k8s.io/klog"
+	"k8s.io/utils/mount"
 
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume"
 )
 

pkg/volume/flexvolume/detacher-defaults.go

@@ -19,9 +19,10 @@ package flexvolume
 import (
 	"time"
 
-	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/klog"
-	"k8s.io/kubernetes/pkg/util/mount"
+	"k8s.io/utils/mount"
+
+	"k8s.io/apimachinery/pkg/types"
 )
 
 type detacherDefaults flexVolumeDetacher

pkg/volume/flexvolume/detacher.go

@@ -20,9 +20,10 @@ import (
 	"fmt"
 	"os"
 
-	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/klog"
-	"k8s.io/kubernetes/pkg/util/mount"
+	"k8s.io/utils/mount"
+
+	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/kubernetes/pkg/volume"
 )
 

pkg/volume/flexvolume/mounter_test.go

@@ -19,10 +19,11 @@ package flexvolume
 import (
 	"testing"
 
+	"k8s.io/utils/mount"
+
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume"
 	"k8s.io/kubernetes/test/utils/harness"
 )

pkg/volume/flexvolume/plugin.go

@@ -26,10 +26,10 @@ import (
 	api "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/klog"
-	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume"
 	"k8s.io/kubernetes/pkg/volume/util"
 	"k8s.io/utils/exec"
+	"k8s.io/utils/mount"
 	utilstrings "k8s.io/utils/strings"
 )
 

pkg/volume/flexvolume/unmounter-defaults.go

@@ -18,7 +18,7 @@ package flexvolume
 
 import (
 	"k8s.io/klog"
-	"k8s.io/kubernetes/pkg/util/mount"
+	"k8s.io/utils/mount"
 )
 
 type unmounterDefaults flexVolumeUnmounter

pkg/volume/flexvolume/unmounter.go

@@ -21,9 +21,10 @@ import (
 	"os"
 
 	"k8s.io/klog"
-	"k8s.io/kubernetes/pkg/util/mount"
-	"k8s.io/kubernetes/pkg/volume"
 	"k8s.io/utils/exec"
+	"k8s.io/utils/mount"
+
+	"k8s.io/kubernetes/pkg/volume"
 )
 
 // FlexVolumeUnmounter is the disk that will be cleaned by this plugin.

pkg/volume/flexvolume/unmounter_test.go

@@ -19,8 +19,9 @@ package flexvolume
 import (
 	"testing"
 
+	"k8s.io/utils/mount"
+
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/test/utils/harness"
 )
 

pkg/volume/flexvolume/util.go

@@ -22,7 +22,8 @@ import (
 	"os"
 
 	"k8s.io/klog"
-	"k8s.io/kubernetes/pkg/util/mount"
+	"k8s.io/utils/mount"
+
 	"k8s.io/kubernetes/pkg/volume"
 	"k8s.io/kubernetes/pkg/volume/util"
 )

pkg/volume/flexvolume/volume.go

@@ -17,10 +17,11 @@ limitations under the License.
 package flexvolume
 
 import (
-	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/utils/mount"
-	"k8s.io/kubernetes/pkg/util/mount"
-	"k8s.io/kubernetes/pkg/volume"
 	utilstrings "k8s.io/utils/strings"
+
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/kubernetes/pkg/volume"
 )
 
 type flexVolume struct {

pkg/volume/flocker/BUILD

@@ -17,7 +17,6 @@ go_library(
     importpath = "k8s.io/kubernetes/pkg/volume/flocker",
     deps = [
         "//pkg/util/env:go_default_library",
-        "//pkg/util/mount:go_default_library",
         "//pkg/volume:go_default_library",
         "//pkg/volume/util:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
@@ -28,6 +27,7 @@ go_library(
         "//staging/src/k8s.io/cloud-provider/volume/helpers:go_default_library",
         "//vendor/github.com/clusterhq/flocker-go:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
+        "//vendor/k8s.io/utils/mount:go_default_library",
         "//vendor/k8s.io/utils/strings:go_default_library",
     ],
 )
@@ -41,7 +41,6 @@ go_test(
     ],
     embed = [":go_default_library"],
     deps = [
-        "//pkg/util/mount:go_default_library",
         "//pkg/volume:go_default_library",
         "//pkg/volume/testing:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
@@ -50,6 +49,7 @@ go_test(
         "//staging/src/k8s.io/client-go/util/testing:go_default_library",
         "//vendor/github.com/clusterhq/flocker-go:go_default_library",
         "//vendor/github.com/stretchr/testify/assert:go_default_library",
+        "//vendor/k8s.io/utils/mount:go_default_library",
     ],
 )
 

pkg/volume/flocker/flocker.go

@@ -23,14 +23,14 @@ import (
 	"time"
 
 	flockerapi "github.com/clusterhq/flocker-go"
-
-	"k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/klog"
-	"k8s.io/kubernetes/pkg/util/env"
+	"k8s.io/utils/mount"
-	"k8s.io/kubernetes/pkg/util/mount"
-	"k8s.io/kubernetes/pkg/volume"
 	utilstrings "k8s.io/utils/strings"
+
+	v1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/kubernetes/pkg/util/env"
+	"k8s.io/kubernetes/pkg/volume"
 )
 
 // ProbeVolumePlugins is the primary entrypoint for volume plugins.

pkg/volume/flocker/flocker_test.go

@@ -21,15 +21,15 @@ import (
 	"os"
 	"testing"
 
+	flockerapi "github.com/clusterhq/flocker-go"
+	"github.com/stretchr/testify/assert"
+	"k8s.io/utils/mount"
+
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 	utiltesting "k8s.io/client-go/util/testing"
-	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume"
 	volumetest "k8s.io/kubernetes/pkg/volume/testing"
-
-	flockerapi "github.com/clusterhq/flocker-go"
-	"github.com/stretchr/testify/assert"
 )
 
 const pluginName = "kubernetes.io/flocker"