Merge pull request #96130 from brahmaroutu/mount-utils-cleanup

Removing utils/mount dependencies from vendor

staging/publishing/import-restrictions.yaml

@@ -240,6 +240,7 @@
   - k8s.io/csi-translation-lib
   - k8s.io/klog
   - k8s.io/legacy-cloud-providers
+  - k8s.io/mount-utils
   - k8s.io/utils
   - k8s.io/apiserver/pkg/util/feature
   - k8s.io/component-base/featuregate

staging/publishing/rules.yaml

@@ -1245,6 +1245,23 @@ rules:
     - repository: apimachinery
       branch: release-1.21
 
+- destination: mount-utils
+  library: true
+  branches:
+  - source:
+      branch: master
+      dir: staging/src/k8s.io/mount-utils
+    name: master
+  - source:
+      branch: release-1.20
+      dir: staging/src/k8s.io/mount-utils
+    name: release-1.20
+    go: 1.15.12
+  - source:
+      branch: release-1.21
+      dir: staging/src/k8s.io/mount-utils
+    name: release-1.21
+
 - destination: legacy-cloud-providers
   library: true
   branches:
@@ -1269,6 +1286,8 @@ rules:
       branch: master
     - repository: controller-manager
       branch: master
+    - repository: mount-utils
+      branch: master
   - source:
       branch: release-1.19
       dir: staging/src/k8s.io/legacy-cloud-providers
@@ -1443,23 +1462,6 @@ rules:
     - repository: metrics
       branch: release-1.21
 
-- destination: mount-utils
-  library: true
-  branches:
-  - source:
-      branch: master
-      dir: staging/src/k8s.io/mount-utils
-    name: master
-  - source:
-      branch: release-1.20
-      dir: staging/src/k8s.io/mount-utils
-    name: release-1.20
-    go: 1.15.12
-  - source:
-      branch: release-1.21
-      dir: staging/src/k8s.io/mount-utils
-    name: release-1.21
-
 - destination: pod-security-admission
   library: true
   branches:

staging/src/k8s.io/legacy-cloud-providers/go.mod

@@ -38,6 +38,7 @@ require (
 	k8s.io/component-base v0.0.0
 	k8s.io/csi-translation-lib v0.0.0
 	k8s.io/klog/v2 v2.9.0
+	k8s.io/mount-utils v0.0.0
 	k8s.io/utils v0.0.0-20201110183641-67b214c5f920
 	sigs.k8s.io/yaml v1.2.0
 )
@@ -52,4 +53,5 @@ replace (
 	k8s.io/controller-manager => ../controller-manager
 	k8s.io/csi-translation-lib => ../csi-translation-lib
 	k8s.io/legacy-cloud-providers => ../legacy-cloud-providers
+	k8s.io/mount-utils => ../mount-utils
 )

staging/src/k8s.io/legacy-cloud-providers/openstack/metadata.go

@@ -30,8 +30,8 @@ import (
 	"strings"
 
 	"k8s.io/klog/v2"
+	"k8s.io/mount-utils"
 	"k8s.io/utils/exec"
-	"k8s.io/utils/mount"
 )
 
 const (