mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-03 19:58:17 +00:00 
			
		
		
		
	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
This commit is contained in:
		@@ -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",
 | 
			
		||||
 
 | 
			
		||||
@@ -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)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user