Remove apimachinery dep from mount library

As part of wanting to move the mount library into staging and then k8s.io/utils, there can be no dependencies on k/k code, and that includes k/apimachinery. This patch makes a small implementation change to no longer need k8s.io/apimachinery/pkg/util/sets

Remove apimachinery dep from mount library
6e5bf40d · Travis Rhoden · d99f49d2 · 6e5bf40d · 6e5bf40d
Commit 6e5bf40d authored Apr 02, 2019 by Travis Rhoden
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

BUILD pkg/util/mount/BUILD +0 -1

mount_linux.go pkg/util/mount/mount_linux.go +7 -3

No files found.
--- a/pkg/util/mount/BUILD
+++ b/pkg/util/mount/BUILD
@@ -37,7 +37,6 @@ go_library(
            "//vendor/k8s.io/utils/nsenter:go_default_library",
        ],
        "@io_bazel_rules_go//go/platform:linux": [
-            "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
            "//vendor/golang.org/x/sys/unix:go_default_library",
            "//vendor/k8s.io/utils/io:go_default_library",
            "//vendor/k8s.io/utils/nsenter:go_default_library",

--- a/pkg/util/mount/mount_linux.go
+++ b/pkg/util/mount/mount_linux.go
@@ -30,7 +30,6 @@ import (
 	"syscall"

 	"golang.org/x/sys/unix"
-	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/klog"
 	utilexec "k8s.io/utils/exec"
 	utilio "k8s.io/utils/io"
@@ -90,8 +89,13 @@ func (mounter *Mounter) Mount(source string, target string, fstype string, optio
 		return mounter.doMount(mounterPath, defaultMountCommand, source, target, fstype, bindRemountOpts)
 	}
 	// The list of filesystems that require containerized mounter on GCI image cluster
-	fsTypesNeedMounter := sets.NewString("nfs", "glusterfs", "ceph", "cifs")
-	if fsTypesNeedMounter.Has(fstype) {
+	fsTypesNeedMounter := map[string]struct{}{
+		"nfs":       {},
+		"glusterfs": {},
+		"ceph":      {},
+		"cifs":      {},
+	}
+	if _, ok := fsTypesNeedMounter[fstype]; ok {
 		mounterPath = mounter.mounterPath
 	}
 	return mounter.doMount(mounterPath, defaultMountCommand, source, target, fstype, options)