From fbe5daed7380ae640c2c6e66530593e3de67ce4b Mon Sep 17 00:00:00 2001 From: Srini Brahmaroutu Date: Wed, 2 Sep 2020 18:29:02 -0700 Subject: [PATCH] Change code to use staging/k8s.io/mount-utils --- cmd/kube-proxy/app/BUILD | 2 +- cmd/kube-proxy/app/conntrack.go | 2 +- cmd/kubelet/app/BUILD | 2 +- cmd/kubelet/app/server.go | 2 +- go.mod | 1 + pkg/controller/volume/attachdetach/BUILD | 2 +- .../attachdetach/attach_detach_controller.go | 2 +- pkg/controller/volume/expand/BUILD | 2 +- .../volume/expand/expand_controller.go | 2 +- pkg/controller/volume/persistentvolume/BUILD | 2 +- .../volume/persistentvolume/volume_host.go | 2 +- pkg/kubelet/BUILD | 4 +-- pkg/kubelet/cm/BUILD | 34 +++++++++---------- pkg/kubelet/cm/container_manager_linux.go | 2 +- .../cm/container_manager_linux_test.go | 2 +- .../cm/container_manager_unsupported.go | 2 +- pkg/kubelet/cm/container_manager_windows.go | 2 +- pkg/kubelet/kubelet.go | 2 +- pkg/kubelet/kubelet_getters.go | 2 +- pkg/kubelet/kubelet_test.go | 2 +- pkg/kubelet/kubelet_volumes_linux_test.go | 2 +- pkg/kubelet/runonce_test.go | 2 +- pkg/kubelet/volume_host.go | 2 +- pkg/kubelet/volumemanager/BUILD | 4 +-- pkg/kubelet/volumemanager/reconciler/BUILD | 4 +-- .../volumemanager/reconciler/reconciler.go | 2 +- .../reconciler/reconciler_test.go | 2 +- pkg/kubelet/volumemanager/volume_manager.go | 2 +- .../volumemanager/volume_manager_test.go | 2 +- pkg/kubemark/BUILD | 2 +- pkg/kubemark/hollow_kubelet.go | 2 +- pkg/util/removeall/BUILD | 4 +-- pkg/util/removeall/removeall.go | 2 +- pkg/util/removeall/removeall_test.go | 2 +- pkg/util/resizefs/BUILD | 30 ++++++++-------- pkg/util/resizefs/resizefs_linux.go | 2 +- pkg/util/resizefs/resizefs_unsupported.go | 2 +- pkg/volume/BUILD | 2 +- pkg/volume/awsebs/BUILD | 4 +-- pkg/volume/awsebs/attacher.go | 2 +- pkg/volume/awsebs/aws_ebs.go | 2 +- pkg/volume/awsebs/aws_ebs_block.go | 2 +- pkg/volume/awsebs/aws_ebs_test.go | 2 +- pkg/volume/awsebs/aws_util.go | 2 +- pkg/volume/azure_file/BUILD | 4 +-- pkg/volume/azure_file/azure_file.go | 2 +- pkg/volume/azure_file/azure_file_test.go | 2 +- pkg/volume/azuredd/BUILD | 2 +- pkg/volume/azuredd/attacher.go | 2 +- pkg/volume/azuredd/azure_common_windows.go | 2 +- pkg/volume/azuredd/azure_dd_block.go | 2 +- pkg/volume/azuredd/azure_mounter.go | 2 +- pkg/volume/cephfs/BUILD | 4 +-- pkg/volume/cephfs/cephfs.go | 2 +- pkg/volume/cephfs/cephfs_test.go | 2 +- pkg/volume/cinder/BUILD | 4 +-- pkg/volume/cinder/attacher.go | 2 +- pkg/volume/cinder/cinder.go | 2 +- pkg/volume/cinder/cinder_block.go | 2 +- pkg/volume/cinder/cinder_test.go | 2 +- pkg/volume/configmap/BUILD | 2 +- pkg/volume/configmap/configmap.go | 2 +- pkg/volume/csi/BUILD | 2 +- pkg/volume/csi/csi_mounter.go | 2 +- pkg/volume/emptydir/BUILD | 6 ++-- pkg/volume/emptydir/empty_dir.go | 2 +- pkg/volume/emptydir/empty_dir_linux.go | 2 +- pkg/volume/emptydir/empty_dir_test.go | 2 +- pkg/volume/emptydir/empty_dir_unsupported.go | 2 +- pkg/volume/fc/BUILD | 4 +-- pkg/volume/fc/attacher.go | 2 +- pkg/volume/fc/disk_manager.go | 2 +- pkg/volume/fc/fc.go | 2 +- pkg/volume/fc/fc_test.go | 2 +- pkg/volume/fc/fc_util.go | 2 +- pkg/volume/flexvolume/BUILD | 4 +-- pkg/volume/flexvolume/attacher-defaults.go | 2 +- pkg/volume/flexvolume/detacher-defaults.go | 2 +- pkg/volume/flexvolume/detacher.go | 2 +- pkg/volume/flexvolume/mounter_test.go | 2 +- pkg/volume/flexvolume/plugin.go | 2 +- pkg/volume/flexvolume/unmounter-defaults.go | 2 +- pkg/volume/flexvolume/unmounter.go | 2 +- pkg/volume/flexvolume/unmounter_test.go | 2 +- pkg/volume/flexvolume/util.go | 2 +- pkg/volume/flexvolume/volume.go | 2 +- pkg/volume/flocker/BUILD | 4 +-- pkg/volume/flocker/flocker.go | 2 +- pkg/volume/flocker/flocker_test.go | 2 +- pkg/volume/gcepd/BUILD | 4 +-- pkg/volume/gcepd/attacher.go | 2 +- pkg/volume/gcepd/gce_pd.go | 2 +- pkg/volume/gcepd/gce_pd_block.go | 2 +- pkg/volume/gcepd/gce_pd_test.go | 2 +- pkg/volume/gcepd/gce_util.go | 2 +- pkg/volume/glusterfs/BUILD | 4 +-- pkg/volume/glusterfs/glusterfs.go | 2 +- pkg/volume/glusterfs/glusterfs_test.go | 2 +- pkg/volume/hostpath/BUILD | 2 +- pkg/volume/hostpath/host_path.go | 2 +- pkg/volume/iscsi/BUILD | 4 +-- pkg/volume/iscsi/attacher.go | 2 +- pkg/volume/iscsi/disk_manager.go | 2 +- pkg/volume/iscsi/iscsi.go | 2 +- pkg/volume/iscsi/iscsi_test.go | 2 +- pkg/volume/iscsi/iscsi_util.go | 2 +- pkg/volume/local/BUILD | 12 +++---- pkg/volume/local/local.go | 2 +- pkg/volume/local/local_test.go | 2 +- pkg/volume/nfs/BUILD | 4 +-- pkg/volume/nfs/nfs.go | 2 +- pkg/volume/nfs/nfs_test.go | 2 +- pkg/volume/plugins.go | 2 +- pkg/volume/portworx/BUILD | 4 +-- pkg/volume/portworx/portworx.go | 2 +- pkg/volume/portworx/portworx_test.go | 2 +- pkg/volume/quobyte/BUILD | 4 +-- pkg/volume/quobyte/quobyte.go | 2 +- pkg/volume/quobyte/quobyte_test.go | 2 +- pkg/volume/rbd/BUILD | 4 +-- pkg/volume/rbd/attacher.go | 2 +- pkg/volume/rbd/disk_manager.go | 2 +- pkg/volume/rbd/rbd.go | 2 +- pkg/volume/rbd/rbd_test.go | 2 +- pkg/volume/rbd/rbd_util.go | 2 +- pkg/volume/scaleio/BUILD | 2 +- pkg/volume/scaleio/sio_volume.go | 2 +- pkg/volume/secret/BUILD | 2 +- pkg/volume/secret/secret.go | 2 +- pkg/volume/storageos/BUILD | 4 +-- pkg/volume/storageos/storageos.go | 2 +- pkg/volume/storageos/storageos_test.go | 2 +- pkg/volume/storageos/storageos_util_test.go | 2 +- pkg/volume/testing/BUILD | 2 +- pkg/volume/testing/testing.go | 2 +- pkg/volume/util/BUILD | 2 +- pkg/volume/util/fsquota/BUILD | 6 ++-- pkg/volume/util/fsquota/quota.go | 2 +- pkg/volume/util/fsquota/quota_linux.go | 4 +-- pkg/volume/util/fsquota/quota_linux_test.go | 2 +- pkg/volume/util/fsquota/quota_unsupported.go | 2 +- pkg/volume/util/hostutil/BUILD | 2 +- pkg/volume/util/hostutil/fake_hostutil.go | 2 +- pkg/volume/util/hostutil/hostutil.go | 2 +- pkg/volume/util/hostutil/hostutil_linux.go | 2 +- .../util/hostutil/hostutil_unsupported.go | 2 +- pkg/volume/util/hostutil/hostutil_windows.go | 2 +- pkg/volume/util/operationexecutor/BUILD | 2 +- .../operationexecutor/operation_executor.go | 2 +- pkg/volume/util/resize_util.go | 2 +- pkg/volume/util/subpath/BUILD | 34 +++++++++---------- pkg/volume/util/subpath/subpath_linux.go | 2 +- pkg/volume/util/subpath/subpath_linux_test.go | 2 +- .../util/subpath/subpath_unsupported.go | 2 +- pkg/volume/util/subpath/subpath_windows.go | 2 +- pkg/volume/util/types/BUILD | 4 +-- pkg/volume/util/types/types.go | 2 +- pkg/volume/util/types/types_test.go | 2 +- pkg/volume/util/util.go | 2 +- pkg/volume/util/volumepathhandler/BUILD | 2 +- .../volumepathhandler/volume_path_handler.go | 2 +- pkg/volume/vsphere_volume/BUILD | 4 +-- pkg/volume/vsphere_volume/attacher.go | 2 +- pkg/volume/vsphere_volume/vsphere_volume.go | 2 +- .../vsphere_volume/vsphere_volume_block.go | 2 +- .../vsphere_volume/vsphere_volume_test.go | 2 +- .../vsphere_volume_util_linux.go | 2 +- test/e2e_node/BUILD | 6 ++-- test/e2e_node/quota_lsci_test.go | 2 +- test/e2e_node/util_xfs_linux.go | 2 +- vendor/modules.txt | 3 ++ 171 files changed, 252 insertions(+), 248 deletions(-) diff --git a/cmd/kube-proxy/app/BUILD b/cmd/kube-proxy/app/BUILD index e76382f0986..fec2efa4c63 100644 --- a/cmd/kube-proxy/app/BUILD +++ b/cmd/kube-proxy/app/BUILD @@ -68,13 +68,13 @@ go_library( "//staging/src/k8s.io/component-base/version:go_default_library", "//staging/src/k8s.io/component-base/version/verflag:go_default_library", "//staging/src/k8s.io/kube-proxy/config/v1alpha1:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/github.com/fsnotify/fsnotify:go_default_library", "//vendor/github.com/pkg/errors:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", "//vendor/k8s.io/klog/v2: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:aix": [ diff --git a/cmd/kube-proxy/app/conntrack.go b/cmd/kube-proxy/app/conntrack.go index 189cdcfdc3c..3ebe9ff2ac2 100644 --- a/cmd/kube-proxy/app/conntrack.go +++ b/cmd/kube-proxy/app/conntrack.go @@ -23,7 +23,7 @@ import ( "strings" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" "k8s.io/kubernetes/pkg/util/sysctl" ) diff --git a/cmd/kubelet/app/BUILD b/cmd/kubelet/app/BUILD index 4cca93e3376..2e9ff53fff0 100644 --- a/cmd/kubelet/app/BUILD +++ b/cmd/kubelet/app/BUILD @@ -118,12 +118,12 @@ go_library( "//staging/src/k8s.io/component-base/version/verflag:go_default_library", "//staging/src/k8s.io/csi-translation-lib/plugins:go_default_library", "//staging/src/k8s.io/kubelet/config/v1beta1:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/github.com/coreos/go-systemd/daemon:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", "//vendor/k8s.io/klog/v2: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", diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index f33f8df7f84..5f7e3555aab 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -36,7 +36,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" diff --git a/go.mod b/go.mod index 4715ecd6bd0..91013271d3e 100644 --- a/go.mod +++ b/go.mod @@ -135,6 +135,7 @@ require ( k8s.io/kubelet v0.0.0 k8s.io/legacy-cloud-providers v0.0.0 k8s.io/metrics v0.0.0 + k8s.io/mount-utils v0.0.0 k8s.io/sample-apiserver v0.0.0 k8s.io/system-validators v1.1.2 k8s.io/utils v0.0.0-20200729134348-d5654de09c73 diff --git a/pkg/controller/volume/attachdetach/BUILD b/pkg/controller/volume/attachdetach/BUILD index cb412ec61f8..1c24377847a 100644 --- a/pkg/controller/volume/attachdetach/BUILD +++ b/pkg/controller/volume/attachdetach/BUILD @@ -45,9 +45,9 @@ go_library( "//staging/src/k8s.io/client-go/util/workqueue:go_default_library", "//staging/src/k8s.io/cloud-provider:go_default_library", "//staging/src/k8s.io/csi-translation-lib:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", "//vendor/k8s.io/utils/exec:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", ], ) diff --git a/pkg/controller/volume/attachdetach/attach_detach_controller.go b/pkg/controller/volume/attachdetach/attach_detach_controller.go index dfcfe7b50d9..4109eaae3da 100644 --- a/pkg/controller/volume/attachdetach/attach_detach_controller.go +++ b/pkg/controller/volume/attachdetach/attach_detach_controller.go @@ -24,8 +24,8 @@ import ( "time" "k8s.io/klog/v2" + "k8s.io/mount-utils" utilexec "k8s.io/utils/exec" - "k8s.io/utils/mount" authenticationv1 "k8s.io/api/authentication/v1" v1 "k8s.io/api/core/v1" diff --git a/pkg/controller/volume/expand/BUILD b/pkg/controller/volume/expand/BUILD index b391fce2246..a71e52306e2 100644 --- a/pkg/controller/volume/expand/BUILD +++ b/pkg/controller/volume/expand/BUILD @@ -33,9 +33,9 @@ go_library( "//staging/src/k8s.io/client-go/tools/record:go_default_library", "//staging/src/k8s.io/client-go/util/workqueue:go_default_library", "//staging/src/k8s.io/cloud-provider:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", "//vendor/k8s.io/utils/exec:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", ], ) diff --git a/pkg/controller/volume/expand/expand_controller.go b/pkg/controller/volume/expand/expand_controller.go index 7d4e833a558..1a3014be5be 100644 --- a/pkg/controller/volume/expand/expand_controller.go +++ b/pkg/controller/volume/expand/expand_controller.go @@ -23,8 +23,8 @@ import ( "time" "k8s.io/klog/v2" + "k8s.io/mount-utils" utilexec "k8s.io/utils/exec" - "k8s.io/utils/mount" authenticationv1 "k8s.io/api/authentication/v1" v1 "k8s.io/api/core/v1" diff --git a/pkg/controller/volume/persistentvolume/BUILD b/pkg/controller/volume/persistentvolume/BUILD index 35584cc4406..0e402a6941e 100644 --- a/pkg/controller/volume/persistentvolume/BUILD +++ b/pkg/controller/volume/persistentvolume/BUILD @@ -56,9 +56,9 @@ go_library( "//staging/src/k8s.io/cloud-provider:go_default_library", "//staging/src/k8s.io/cloud-provider/volume/errors:go_default_library", "//staging/src/k8s.io/csi-translation-lib:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", "//vendor/k8s.io/utils/exec:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", ], ) diff --git a/pkg/controller/volume/persistentvolume/volume_host.go b/pkg/controller/volume/persistentvolume/volume_host.go index d75333f63d3..049ff87b840 100644 --- a/pkg/controller/volume/persistentvolume/volume_host.go +++ b/pkg/controller/volume/persistentvolume/volume_host.go @@ -21,8 +21,8 @@ import ( "net" "k8s.io/klog/v2" + "k8s.io/mount-utils" utilexec "k8s.io/utils/exec" - "k8s.io/utils/mount" authenticationv1 "k8s.io/api/authentication/v1" v1 "k8s.io/api/core/v1" diff --git a/pkg/kubelet/BUILD b/pkg/kubelet/BUILD index 669b074c798..dc4d9949134 100644 --- a/pkg/kubelet/BUILD +++ b/pkg/kubelet/BUILD @@ -144,6 +144,7 @@ go_library( "//staging/src/k8s.io/cri-api/pkg/apis:go_default_library", "//staging/src/k8s.io/cri-api/pkg/apis/runtime/v1alpha2:go_default_library", "//staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//third_party/forked/golang/expansion:go_default_library", "//vendor/github.com/golang/groupcache/lru:go_default_library", "//vendor/github.com/google/cadvisor/info/v1:go_default_library", @@ -151,7 +152,6 @@ go_library( "//vendor/k8s.io/klog/v2: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", "//vendor/k8s.io/utils/strings:go_default_library", @@ -256,12 +256,12 @@ go_test( "//staging/src/k8s.io/component-base/featuregate/testing:go_default_library", "//staging/src/k8s.io/component-base/version:go_default_library", "//staging/src/k8s.io/cri-api/pkg/apis/runtime/v1alpha2:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/github.com/golang/groupcache/lru:go_default_library", "//vendor/github.com/google/cadvisor/info/v1:go_default_library", "//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", ], ) diff --git a/pkg/kubelet/cm/BUILD b/pkg/kubelet/cm/BUILD index cb04702db5f..dab983bf21c 100644 --- a/pkg/kubelet/cm/BUILD +++ b/pkg/kubelet/cm/BUILD @@ -48,7 +48,7 @@ go_library( "@io_bazel_rules_go//go/platform:aix": [ "//pkg/kubelet/cadvisor:go_default_library", "//staging/src/k8s.io/client-go/tools/record:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", ], "@io_bazel_rules_go//go/platform:android": [ "//pkg/api/v1/resource:go_default_library", @@ -71,6 +71,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/util/version:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//staging/src/k8s.io/client-go/tools/record:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/github.com/docker/go-units:go_default_library", "//vendor/github.com/opencontainers/runc/libcontainer/cgroups:go_default_library", "//vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs:go_default_library", @@ -78,38 +79,37 @@ 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", "//staging/src/k8s.io/client-go/tools/record:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", ], "@io_bazel_rules_go//go/platform:dragonfly": [ "//pkg/kubelet/cadvisor:go_default_library", "//staging/src/k8s.io/client-go/tools/record:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", ], "@io_bazel_rules_go//go/platform:freebsd": [ "//pkg/kubelet/cadvisor:go_default_library", "//staging/src/k8s.io/client-go/tools/record:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", ], "@io_bazel_rules_go//go/platform:illumos": [ "//pkg/kubelet/cadvisor:go_default_library", "//staging/src/k8s.io/client-go/tools/record:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", ], "@io_bazel_rules_go//go/platform:ios": [ "//pkg/kubelet/cadvisor:go_default_library", "//staging/src/k8s.io/client-go/tools/record:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", ], "@io_bazel_rules_go//go/platform:js": [ "//pkg/kubelet/cadvisor:go_default_library", "//staging/src/k8s.io/client-go/tools/record:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", ], "@io_bazel_rules_go//go/platform:linux": [ "//pkg/api/v1/resource:go_default_library", @@ -132,6 +132,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/util/version:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//staging/src/k8s.io/client-go/tools/record:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/github.com/docker/go-units:go_default_library", "//vendor/github.com/opencontainers/runc/libcontainer/cgroups:go_default_library", "//vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs:go_default_library", @@ -139,38 +140,37 @@ 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", "//staging/src/k8s.io/client-go/tools/record:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", ], "@io_bazel_rules_go//go/platform:netbsd": [ "//pkg/kubelet/cadvisor:go_default_library", "//staging/src/k8s.io/client-go/tools/record:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", ], "@io_bazel_rules_go//go/platform:openbsd": [ "//pkg/kubelet/cadvisor:go_default_library", "//staging/src/k8s.io/client-go/tools/record:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", ], "@io_bazel_rules_go//go/platform:plan9": [ "//pkg/kubelet/cadvisor:go_default_library", "//staging/src/k8s.io/client-go/tools/record:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", ], "@io_bazel_rules_go//go/platform:solaris": [ "//pkg/kubelet/cadvisor:go_default_library", "//staging/src/k8s.io/client-go/tools/record:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", ], "@io_bazel_rules_go//go/platform:windows": [ "//pkg/kubelet/cadvisor:go_default_library", "//staging/src/k8s.io/client-go/tools/record:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", ], "//conditions:default": [], }), @@ -196,10 +196,10 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", "//staging/src/k8s.io/component-base/featuregate/testing:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/github.com/opencontainers/runc/libcontainer/cgroups: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", @@ -209,10 +209,10 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", "//staging/src/k8s.io/component-base/featuregate/testing:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/github.com/opencontainers/runc/libcontainer/cgroups: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": [], }), diff --git a/pkg/kubelet/cm/container_manager_linux.go b/pkg/kubelet/cm/container_manager_linux.go index d0e963a4489..6ba41468776 100644 --- a/pkg/kubelet/cm/container_manager_linux.go +++ b/pkg/kubelet/cm/container_manager_linux.go @@ -34,8 +34,8 @@ import ( cgroupfs2 "github.com/opencontainers/runc/libcontainer/cgroups/fs2" "github.com/opencontainers/runc/libcontainer/configs" "k8s.io/klog/v2" + "k8s.io/mount-utils" utilio "k8s.io/utils/io" - "k8s.io/utils/mount" utilpath "k8s.io/utils/path" v1 "k8s.io/api/core/v1" diff --git a/pkg/kubelet/cm/container_manager_linux_test.go b/pkg/kubelet/cm/container_manager_linux_test.go index e9e5edfc5f1..41015ffdbda 100644 --- a/pkg/kubelet/cm/container_manager_linux_test.go +++ b/pkg/kubelet/cm/container_manager_linux_test.go @@ -28,7 +28,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "k8s.io/utils/mount" + "k8s.io/mount-utils" ) func fakeContainerMgrMountInt() mount.Interface { diff --git a/pkg/kubelet/cm/container_manager_unsupported.go b/pkg/kubelet/cm/container_manager_unsupported.go index d59afa81e50..dd0fafc6eb8 100644 --- a/pkg/kubelet/cm/container_manager_unsupported.go +++ b/pkg/kubelet/cm/container_manager_unsupported.go @@ -21,7 +21,7 @@ package cm import ( "fmt" - "k8s.io/utils/mount" + "k8s.io/mount-utils" v1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/record" diff --git a/pkg/kubelet/cm/container_manager_windows.go b/pkg/kubelet/cm/container_manager_windows.go index e01883898f4..838ab83b360 100644 --- a/pkg/kubelet/cm/container_manager_windows.go +++ b/pkg/kubelet/cm/container_manager_windows.go @@ -25,7 +25,7 @@ import ( "fmt" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index cf56463cc38..81f2542d2dc 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -34,9 +34,9 @@ import ( "k8s.io/client-go/informers" cadvisorapi "github.com/google/cadvisor/info/v1" + "k8s.io/mount-utils" utilexec "k8s.io/utils/exec" "k8s.io/utils/integer" - "k8s.io/utils/mount" utilnet "k8s.io/utils/net" v1 "k8s.io/api/core/v1" diff --git a/pkg/kubelet/kubelet_getters.go b/pkg/kubelet/kubelet_getters.go index aed08db4c2f..ebbe2e7aca6 100644 --- a/pkg/kubelet/kubelet_getters.go +++ b/pkg/kubelet/kubelet_getters.go @@ -26,7 +26,7 @@ import ( cadvisorapiv1 "github.com/google/cadvisor/info/v1" cadvisorv2 "github.com/google/cadvisor/info/v2" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" utilpath "k8s.io/utils/path" utilstrings "k8s.io/utils/strings" diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go index cb8bcdb8697..47a5350809d 100644 --- a/pkg/kubelet/kubelet_test.go +++ b/pkg/kubelet/kubelet_test.go @@ -28,7 +28,7 @@ import ( cadvisorapi "github.com/google/cadvisor/info/v1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "k8s.io/utils/mount" + "k8s.io/mount-utils" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" diff --git a/pkg/kubelet/kubelet_volumes_linux_test.go b/pkg/kubelet/kubelet_volumes_linux_test.go index bd1c073b11f..bb2be4f0913 100644 --- a/pkg/kubelet/kubelet_volumes_linux_test.go +++ b/pkg/kubelet/kubelet_volumes_linux_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/apimachinery/pkg/types" _ "k8s.io/kubernetes/pkg/apis/core/install" - "k8s.io/utils/mount" + "k8s.io/mount-utils" ) func validateDirExists(dir string) error { diff --git a/pkg/kubelet/runonce_test.go b/pkg/kubelet/runonce_test.go index 71a7172c2b4..3ff4b32c930 100644 --- a/pkg/kubelet/runonce_test.go +++ b/pkg/kubelet/runonce_test.go @@ -23,7 +23,7 @@ import ( cadvisorapi "github.com/google/cadvisor/info/v1" cadvisorapiv2 "github.com/google/cadvisor/info/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/kubelet/volume_host.go b/pkg/kubelet/volume_host.go index b9b6a0eae7b..c4add6c5f06 100644 --- a/pkg/kubelet/volume_host.go +++ b/pkg/kubelet/volume_host.go @@ -22,8 +22,8 @@ import ( "runtime" "k8s.io/klog/v2" + "k8s.io/mount-utils" utilexec "k8s.io/utils/exec" - "k8s.io/utils/mount" authenticationv1 "k8s.io/api/authentication/v1" v1 "k8s.io/api/core/v1" diff --git a/pkg/kubelet/volumemanager/BUILD b/pkg/kubelet/volumemanager/BUILD index 0d6a83efa05..1f168c9bf15 100644 --- a/pkg/kubelet/volumemanager/BUILD +++ b/pkg/kubelet/volumemanager/BUILD @@ -38,8 +38,8 @@ go_library( "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//staging/src/k8s.io/client-go/tools/record:go_default_library", "//staging/src/k8s.io/csi-translation-lib:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", ], ) @@ -69,7 +69,7 @@ go_test( "//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library", "//staging/src/k8s.io/client-go/tools/record:go_default_library", "//staging/src/k8s.io/client-go/util/testing:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", ], ) diff --git a/pkg/kubelet/volumemanager/reconciler/BUILD b/pkg/kubelet/volumemanager/reconciler/BUILD index 8bc35e6b2a2..c96ea3114d0 100644 --- a/pkg/kubelet/volumemanager/reconciler/BUILD +++ b/pkg/kubelet/volumemanager/reconciler/BUILD @@ -27,8 +27,8 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/klog/v2: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", ], @@ -57,9 +57,9 @@ go_test( "//staging/src/k8s.io/client-go/testing:go_default_library", "//staging/src/k8s.io/client-go/tools/record:go_default_library", "//staging/src/k8s.io/component-base/featuregate/testing:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", ], ) diff --git a/pkg/kubelet/volumemanager/reconciler/reconciler.go b/pkg/kubelet/volumemanager/reconciler/reconciler.go index 4ad616b1634..a69d69addeb 100644 --- a/pkg/kubelet/volumemanager/reconciler/reconciler.go +++ b/pkg/kubelet/volumemanager/reconciler/reconciler.go @@ -29,7 +29,7 @@ import ( "time" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" utilpath "k8s.io/utils/path" utilstrings "k8s.io/utils/strings" diff --git a/pkg/kubelet/volumemanager/reconciler/reconciler_test.go b/pkg/kubelet/volumemanager/reconciler/reconciler_test.go index 8f219323d30..060b7bfddbd 100644 --- a/pkg/kubelet/volumemanager/reconciler/reconciler_test.go +++ b/pkg/kubelet/volumemanager/reconciler/reconciler_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" diff --git a/pkg/kubelet/volumemanager/volume_manager.go b/pkg/kubelet/volumemanager/volume_manager.go index a32cb7b9fa9..249cba33651 100644 --- a/pkg/kubelet/volumemanager/volume_manager.go +++ b/pkg/kubelet/volumemanager/volume_manager.go @@ -25,7 +25,7 @@ import ( "time" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" v1 "k8s.io/api/core/v1" k8stypes "k8s.io/apimachinery/pkg/types" diff --git a/pkg/kubelet/volumemanager/volume_manager_test.go b/pkg/kubelet/volumemanager/volume_manager_test.go index 61bbc3cac24..2afa7d5b2a2 100644 --- a/pkg/kubelet/volumemanager/volume_manager_test.go +++ b/pkg/kubelet/volumemanager/volume_manager_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "k8s.io/utils/mount" + "k8s.io/mount-utils" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/kubemark/BUILD b/pkg/kubemark/BUILD index dec45223351..739895b83f0 100644 --- a/pkg/kubemark/BUILD +++ b/pkg/kubemark/BUILD @@ -68,10 +68,10 @@ go_library( "//staging/src/k8s.io/client-go/tools/cache:go_default_library", "//staging/src/k8s.io/client-go/tools/record:go_default_library", "//staging/src/k8s.io/cri-api/pkg/apis:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//test/utils:go_default_library", "//vendor/k8s.io/klog/v2: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", ], ) diff --git a/pkg/kubemark/hollow_kubelet.go b/pkg/kubemark/hollow_kubelet.go index bccc26bd50f..254b71101c8 100644 --- a/pkg/kubemark/hollow_kubelet.go +++ b/pkg/kubemark/hollow_kubelet.go @@ -21,7 +21,7 @@ import ( "time" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clientset "k8s.io/client-go/kubernetes" diff --git a/pkg/util/removeall/BUILD b/pkg/util/removeall/BUILD index 7b1fe6cc87b..f5b54ea903c 100644 --- a/pkg/util/removeall/BUILD +++ b/pkg/util/removeall/BUILD @@ -12,7 +12,7 @@ go_test( embed = [":go_default_library"], deps = [ "//staging/src/k8s.io/client-go/util/testing:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", ], ) @@ -20,7 +20,7 @@ go_library( name = "go_default_library", srcs = ["removeall.go"], importpath = "k8s.io/kubernetes/pkg/util/removeall", - deps = ["//vendor/k8s.io/utils/mount:go_default_library"], + deps = ["//staging/src/k8s.io/mount-utils:go_default_library"], ) filegroup( diff --git a/pkg/util/removeall/removeall.go b/pkg/util/removeall/removeall.go index 66717ee29d0..1d268e18ee6 100644 --- a/pkg/util/removeall/removeall.go +++ b/pkg/util/removeall/removeall.go @@ -22,7 +22,7 @@ import ( "os" "syscall" - "k8s.io/utils/mount" + "k8s.io/mount-utils" ) // RemoveAllOneFilesystem removes path and any children it contains. diff --git a/pkg/util/removeall/removeall_test.go b/pkg/util/removeall/removeall_test.go index 8fbdf733f14..6b164d22b2c 100644 --- a/pkg/util/removeall/removeall_test.go +++ b/pkg/util/removeall/removeall_test.go @@ -24,7 +24,7 @@ import ( "testing" utiltesting "k8s.io/client-go/util/testing" - "k8s.io/utils/mount" + "k8s.io/mount-utils" ) type fakeMounter struct { diff --git a/pkg/util/resizefs/BUILD b/pkg/util/resizefs/BUILD index 7578dd40b83..19f011b181a 100644 --- a/pkg/util/resizefs/BUILD +++ b/pkg/util/resizefs/BUILD @@ -10,51 +10,51 @@ go_library( visibility = ["//visibility:public"], deps = select({ "@io_bazel_rules_go//go/platform:aix": [ - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", ], "@io_bazel_rules_go//go/platform:android": [ + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", ], "@io_bazel_rules_go//go/platform:darwin": [ - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", ], "@io_bazel_rules_go//go/platform:dragonfly": [ - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", ], "@io_bazel_rules_go//go/platform:freebsd": [ - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", ], "@io_bazel_rules_go//go/platform:illumos": [ - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", ], "@io_bazel_rules_go//go/platform:ios": [ - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", ], "@io_bazel_rules_go//go/platform:js": [ - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", ], "@io_bazel_rules_go//go/platform:linux": [ + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", ], "@io_bazel_rules_go//go/platform:nacl": [ - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", ], "@io_bazel_rules_go//go/platform:netbsd": [ - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", ], "@io_bazel_rules_go//go/platform:openbsd": [ - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", ], "@io_bazel_rules_go//go/platform:plan9": [ - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", ], "@io_bazel_rules_go//go/platform:solaris": [ - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", ], "@io_bazel_rules_go//go/platform:windows": [ - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", ], "//conditions:default": [], }), diff --git a/pkg/util/resizefs/resizefs_linux.go b/pkg/util/resizefs/resizefs_linux.go index 9df5a88eeda..db47cacaa4a 100644 --- a/pkg/util/resizefs/resizefs_linux.go +++ b/pkg/util/resizefs/resizefs_linux.go @@ -22,7 +22,7 @@ import ( "fmt" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" ) // ResizeFs Provides support for resizing file systems diff --git a/pkg/util/resizefs/resizefs_unsupported.go b/pkg/util/resizefs/resizefs_unsupported.go index cde1d4ca082..6fbae9ca477 100644 --- a/pkg/util/resizefs/resizefs_unsupported.go +++ b/pkg/util/resizefs/resizefs_unsupported.go @@ -21,7 +21,7 @@ package resizefs import ( "fmt" - "k8s.io/utils/mount" + "k8s.io/mount-utils" ) // ResizeFs Provides support for resizing file systems diff --git a/pkg/volume/BUILD b/pkg/volume/BUILD index 61c22c29bdd..9a1ac0e296a 100644 --- a/pkg/volume/BUILD +++ b/pkg/volume/BUILD @@ -35,9 +35,9 @@ go_library( "//staging/src/k8s.io/client-go/tools/cache:go_default_library", "//staging/src/k8s.io/client-go/tools/record:go_default_library", "//staging/src/k8s.io/cloud-provider:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/klog/v2: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": [ "//pkg/features:go_default_library", diff --git a/pkg/volume/awsebs/BUILD b/pkg/volume/awsebs/BUILD index d99ff7e3951..47cf8e4571d 100644 --- a/pkg/volume/awsebs/BUILD +++ b/pkg/volume/awsebs/BUILD @@ -31,8 +31,8 @@ go_library( "//staging/src/k8s.io/cloud-provider:go_default_library", "//staging/src/k8s.io/cloud-provider/volume/helpers:go_default_library", "//staging/src/k8s.io/legacy-cloud-providers/aws:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", "//vendor/k8s.io/utils/strings:go_default_library", ], ) @@ -56,9 +56,9 @@ go_test( "//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library", "//staging/src/k8s.io/client-go/util/testing:go_default_library", "//staging/src/k8s.io/legacy-cloud-providers/aws:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", ], ) diff --git a/pkg/volume/awsebs/attacher.go b/pkg/volume/awsebs/attacher.go index f68471cf31e..da8eae119f1 100644 --- a/pkg/volume/awsebs/attacher.go +++ b/pkg/volume/awsebs/attacher.go @@ -28,7 +28,7 @@ import ( "time" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/volume/awsebs/aws_ebs.go b/pkg/volume/awsebs/aws_ebs.go index 225278cce44..2d3d459c0ea 100644 --- a/pkg/volume/awsebs/aws_ebs.go +++ b/pkg/volume/awsebs/aws_ebs.go @@ -29,7 +29,7 @@ import ( "strings" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" diff --git a/pkg/volume/awsebs/aws_ebs_block.go b/pkg/volume/awsebs/aws_ebs_block.go index a9c4eca3228..d09a69ca027 100644 --- a/pkg/volume/awsebs/aws_ebs_block.go +++ b/pkg/volume/awsebs/aws_ebs_block.go @@ -25,7 +25,7 @@ import ( "strings" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" utilstrings "k8s.io/utils/strings" v1 "k8s.io/api/core/v1" diff --git a/pkg/volume/awsebs/aws_ebs_test.go b/pkg/volume/awsebs/aws_ebs_test.go index 849770802f1..304a7496f8b 100644 --- a/pkg/volume/awsebs/aws_ebs_test.go +++ b/pkg/volume/awsebs/aws_ebs_test.go @@ -26,7 +26,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "k8s.io/utils/mount" + "k8s.io/mount-utils" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/volume/awsebs/aws_util.go b/pkg/volume/awsebs/aws_util.go index 4272f76c607..4a3ae61e955 100644 --- a/pkg/volume/awsebs/aws_util.go +++ b/pkg/volume/awsebs/aws_util.go @@ -27,7 +27,7 @@ import ( "time" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" diff --git a/pkg/volume/azure_file/BUILD b/pkg/volume/azure_file/BUILD index 0fcbef38088..9d7daa2ce37 100644 --- a/pkg/volume/azure_file/BUILD +++ b/pkg/volume/azure_file/BUILD @@ -23,9 +23,9 @@ go_library( "//staging/src/k8s.io/cloud-provider/volume/helpers:go_default_library", "//staging/src/k8s.io/legacy-cloud-providers/azure:go_default_library", "//staging/src/k8s.io/legacy-cloud-providers/azure/clients/fileclient:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2019-06-01/storage:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", "//vendor/k8s.io/utils/strings:go_default_library", ], ) @@ -43,8 +43,8 @@ go_test( "//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library", "//staging/src/k8s.io/cloud-provider/fake:go_default_library", "//staging/src/k8s.io/legacy-cloud-providers/azure:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/github.com/Azure/go-autorest/autorest/to:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", ], ) diff --git a/pkg/volume/azure_file/azure_file.go b/pkg/volume/azure_file/azure_file.go index 9d0551aa5c4..456112f205d 100644 --- a/pkg/volume/azure_file/azure_file.go +++ b/pkg/volume/azure_file/azure_file.go @@ -26,7 +26,7 @@ import ( "time" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" utilstrings "k8s.io/utils/strings" v1 "k8s.io/api/core/v1" diff --git a/pkg/volume/azure_file/azure_file_test.go b/pkg/volume/azure_file/azure_file_test.go index 6d42eb9ad8c..e528345b1a0 100644 --- a/pkg/volume/azure_file/azure_file_test.go +++ b/pkg/volume/azure_file/azure_file_test.go @@ -33,7 +33,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/kubernetes/fake" fakecloud "k8s.io/cloud-provider/fake" - "k8s.io/utils/mount" + "k8s.io/mount-utils" "k8s.io/kubernetes/pkg/volume" volumetest "k8s.io/kubernetes/pkg/volume/testing" diff --git a/pkg/volume/azuredd/BUILD b/pkg/volume/azuredd/BUILD index 992dd3be784..c37196f05ca 100644 --- a/pkg/volume/azuredd/BUILD +++ b/pkg/volume/azuredd/BUILD @@ -36,10 +36,10 @@ go_library( "//staging/src/k8s.io/cloud-provider:go_default_library", "//staging/src/k8s.io/cloud-provider/volume/helpers:go_default_library", "//staging/src/k8s.io/legacy-cloud-providers/azure:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute:go_default_library", "//vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2019-06-01/storage:go_default_library", "//vendor/k8s.io/klog/v2: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:aix": [ diff --git a/pkg/volume/azuredd/attacher.go b/pkg/volume/azuredd/attacher.go index a50c0cb85e3..0a37fec958f 100644 --- a/pkg/volume/azuredd/attacher.go +++ b/pkg/volume/azuredd/attacher.go @@ -29,7 +29,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/volume/azuredd/azure_common_windows.go b/pkg/volume/azuredd/azure_common_windows.go index 6ca01d21bea..7efc7f89a00 100644 --- a/pkg/volume/azuredd/azure_common_windows.go +++ b/pkg/volume/azuredd/azure_common_windows.go @@ -26,8 +26,8 @@ import ( "strings" "k8s.io/klog/v2" + "k8s.io/mount-utils" utilexec "k8s.io/utils/exec" - "k8s.io/utils/mount" ) var winDiskNumFormat = "/dev/disk%d" diff --git a/pkg/volume/azuredd/azure_dd_block.go b/pkg/volume/azuredd/azure_dd_block.go index 052bb3da1c4..b13618290a4 100644 --- a/pkg/volume/azuredd/azure_dd_block.go +++ b/pkg/volume/azuredd/azure_dd_block.go @@ -23,7 +23,7 @@ import ( "path/filepath" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" utilstrings "k8s.io/utils/strings" v1 "k8s.io/api/core/v1" diff --git a/pkg/volume/azuredd/azure_mounter.go b/pkg/volume/azuredd/azure_mounter.go index 77a8166bd9f..d4c2a6b80a2 100644 --- a/pkg/volume/azuredd/azure_mounter.go +++ b/pkg/volume/azuredd/azure_mounter.go @@ -24,7 +24,7 @@ import ( "runtime" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" v1 "k8s.io/api/core/v1" "k8s.io/kubernetes/pkg/volume" diff --git a/pkg/volume/cephfs/BUILD b/pkg/volume/cephfs/BUILD index 81c1be537ad..a6366ca5b0c 100644 --- a/pkg/volume/cephfs/BUILD +++ b/pkg/volume/cephfs/BUILD @@ -19,8 +19,8 @@ go_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", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", "//vendor/k8s.io/utils/strings:go_default_library", ], ) @@ -35,7 +35,7 @@ go_test( "//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", + "//staging/src/k8s.io/mount-utils:go_default_library", ], ) diff --git a/pkg/volume/cephfs/cephfs.go b/pkg/volume/cephfs/cephfs.go index 1bc49e35918..779b7122ab6 100644 --- a/pkg/volume/cephfs/cephfs.go +++ b/pkg/volume/cephfs/cephfs.go @@ -26,7 +26,7 @@ import ( "strings" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" utilstrings "k8s.io/utils/strings" v1 "k8s.io/api/core/v1" diff --git a/pkg/volume/cephfs/cephfs_test.go b/pkg/volume/cephfs/cephfs_test.go index abe498c5f10..83d2d0599c0 100644 --- a/pkg/volume/cephfs/cephfs_test.go +++ b/pkg/volume/cephfs/cephfs_test.go @@ -21,7 +21,7 @@ import ( "path/filepath" "testing" - "k8s.io/utils/mount" + "k8s.io/mount-utils" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/volume/cinder/BUILD b/pkg/volume/cinder/BUILD index da954ec8f2d..be71a643ea6 100644 --- a/pkg/volume/cinder/BUILD +++ b/pkg/volume/cinder/BUILD @@ -30,10 +30,10 @@ go_library( "//staging/src/k8s.io/cloud-provider:go_default_library", "//staging/src/k8s.io/cloud-provider/volume/helpers:go_default_library", "//staging/src/k8s.io/legacy-cloud-providers/openstack:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/klog/v2: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", ], ) @@ -57,8 +57,8 @@ go_test( "//staging/src/k8s.io/client-go/util/testing:go_default_library", "//staging/src/k8s.io/cloud-provider:go_default_library", "//staging/src/k8s.io/legacy-cloud-providers/openstack:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", ], ) diff --git a/pkg/volume/cinder/attacher.go b/pkg/volume/cinder/attacher.go index fa84629ca41..8f30b17e57d 100644 --- a/pkg/volume/cinder/attacher.go +++ b/pkg/volume/cinder/attacher.go @@ -30,7 +30,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" "k8s.io/kubernetes/pkg/volume" volumeutil "k8s.io/kubernetes/pkg/volume/util" diff --git a/pkg/volume/cinder/cinder.go b/pkg/volume/cinder/cinder.go index b2b82ad3a71..1c95a21f53a 100644 --- a/pkg/volume/cinder/cinder.go +++ b/pkg/volume/cinder/cinder.go @@ -26,8 +26,8 @@ import ( "path/filepath" "k8s.io/klog/v2" + "k8s.io/mount-utils" "k8s.io/utils/keymutex" - "k8s.io/utils/mount" utilstrings "k8s.io/utils/strings" v1 "k8s.io/api/core/v1" diff --git a/pkg/volume/cinder/cinder_block.go b/pkg/volume/cinder/cinder_block.go index f17eb6177bd..b20680afcb9 100644 --- a/pkg/volume/cinder/cinder_block.go +++ b/pkg/volume/cinder/cinder_block.go @@ -23,7 +23,7 @@ import ( "path/filepath" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" utilstrings "k8s.io/utils/strings" v1 "k8s.io/api/core/v1" diff --git a/pkg/volume/cinder/cinder_test.go b/pkg/volume/cinder/cinder_test.go index bd0d0c6b929..ecbe2e5f038 100644 --- a/pkg/volume/cinder/cinder_test.go +++ b/pkg/volume/cinder/cinder_test.go @@ -28,7 +28,7 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" utiltesting "k8s.io/client-go/util/testing" - "k8s.io/utils/mount" + "k8s.io/mount-utils" "k8s.io/kubernetes/pkg/volume" volumetest "k8s.io/kubernetes/pkg/volume/testing" diff --git a/pkg/volume/configmap/BUILD b/pkg/volume/configmap/BUILD index a94eaff96e8..2d1ab6d1e15 100644 --- a/pkg/volume/configmap/BUILD +++ b/pkg/volume/configmap/BUILD @@ -20,8 +20,8 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/api/errors: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", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", "//vendor/k8s.io/utils/strings:go_default_library", ], ) diff --git a/pkg/volume/configmap/configmap.go b/pkg/volume/configmap/configmap.go index 35613125c2b..c3b9324075c 100644 --- a/pkg/volume/configmap/configmap.go +++ b/pkg/volume/configmap/configmap.go @@ -20,7 +20,7 @@ import ( "fmt" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" utilstrings "k8s.io/utils/strings" v1 "k8s.io/api/core/v1" diff --git a/pkg/volume/csi/BUILD b/pkg/volume/csi/BUILD index eb5c727f7a7..689240b15ea 100644 --- a/pkg/volume/csi/BUILD +++ b/pkg/volume/csi/BUILD @@ -36,12 +36,12 @@ go_library( "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//staging/src/k8s.io/client-go/listers/storage/v1:go_default_library", "//staging/src/k8s.io/csi-translation-lib/plugins:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/github.com/container-storage-interface/spec/lib/go/csi:go_default_library", "//vendor/google.golang.org/grpc:go_default_library", "//vendor/google.golang.org/grpc/codes:go_default_library", "//vendor/google.golang.org/grpc/status:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", "//vendor/k8s.io/utils/strings:go_default_library", ], ) diff --git a/pkg/volume/csi/csi_mounter.go b/pkg/volume/csi/csi_mounter.go index 4195ab38759..b4f135317c2 100644 --- a/pkg/volume/csi/csi_mounter.go +++ b/pkg/volume/csi/csi_mounter.go @@ -36,7 +36,7 @@ import ( "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/volume" volumetypes "k8s.io/kubernetes/pkg/volume/util/types" - "k8s.io/utils/mount" + "k8s.io/mount-utils" utilstrings "k8s.io/utils/strings" ) diff --git a/pkg/volume/emptydir/BUILD b/pkg/volume/emptydir/BUILD index 004445d24a1..4a7621aa511 100644 --- a/pkg/volume/emptydir/BUILD +++ b/pkg/volume/emptydir/BUILD @@ -24,8 +24,8 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/api/resource: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", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/klog/v2: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": [ @@ -55,7 +55,7 @@ go_test( "//staging/src/k8s.io/apiserver/pkg/util/feature: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", + "//staging/src/k8s.io/mount-utils:go_default_library", ], "@io_bazel_rules_go//go/platform:linux": [ "//pkg/features:go_default_library", @@ -69,7 +69,7 @@ go_test( "//staging/src/k8s.io/apiserver/pkg/util/feature: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", + "//staging/src/k8s.io/mount-utils:go_default_library", ], "//conditions:default": [], }), diff --git a/pkg/volume/emptydir/empty_dir.go b/pkg/volume/emptydir/empty_dir.go index 07384cc9e05..c46dcf83a6a 100644 --- a/pkg/volume/emptydir/empty_dir.go +++ b/pkg/volume/emptydir/empty_dir.go @@ -22,7 +22,7 @@ import ( "path/filepath" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" utilstrings "k8s.io/utils/strings" v1 "k8s.io/api/core/v1" diff --git a/pkg/volume/emptydir/empty_dir_linux.go b/pkg/volume/emptydir/empty_dir_linux.go index dfcbc97a9b9..10f273b2a38 100644 --- a/pkg/volume/emptydir/empty_dir_linux.go +++ b/pkg/volume/emptydir/empty_dir_linux.go @@ -25,7 +25,7 @@ import ( "golang.org/x/sys/unix" "k8s.io/apimachinery/pkg/api/resource" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" "k8s.io/api/core/v1" ) diff --git a/pkg/volume/emptydir/empty_dir_test.go b/pkg/volume/emptydir/empty_dir_test.go index 78663ac2938..a3dfd858931 100644 --- a/pkg/volume/emptydir/empty_dir_test.go +++ b/pkg/volume/emptydir/empty_dir_test.go @@ -36,7 +36,7 @@ import ( "k8s.io/kubernetes/pkg/volume" volumetest "k8s.io/kubernetes/pkg/volume/testing" "k8s.io/kubernetes/pkg/volume/util" - "k8s.io/utils/mount" + "k8s.io/mount-utils" ) // Construct an instance of a plugin, by name. diff --git a/pkg/volume/emptydir/empty_dir_unsupported.go b/pkg/volume/emptydir/empty_dir_unsupported.go index 45dc0defa47..75dac70ba50 100644 --- a/pkg/volume/emptydir/empty_dir_unsupported.go +++ b/pkg/volume/emptydir/empty_dir_unsupported.go @@ -20,7 +20,7 @@ package emptydir import ( "k8s.io/apimachinery/pkg/api/resource" - "k8s.io/utils/mount" + "k8s.io/mount-utils" v1 "k8s.io/api/core/v1" ) diff --git a/pkg/volume/fc/BUILD b/pkg/volume/fc/BUILD index afeee28bf07..4cc71cd94dd 100644 --- a/pkg/volume/fc/BUILD +++ b/pkg/volume/fc/BUILD @@ -23,9 +23,9 @@ go_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", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/klog/v2: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", ], ) @@ -46,8 +46,8 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", "//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library", "//staging/src/k8s.io/client-go/util/testing:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/utils/exec/testing:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", ], ) diff --git a/pkg/volume/fc/attacher.go b/pkg/volume/fc/attacher.go index a9252286412..a589a40eea4 100644 --- a/pkg/volume/fc/attacher.go +++ b/pkg/volume/fc/attacher.go @@ -24,7 +24,7 @@ import ( "time" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/volume/fc/disk_manager.go b/pkg/volume/fc/disk_manager.go index e12aa3ff7f6..dbcdd2cd033 100644 --- a/pkg/volume/fc/disk_manager.go +++ b/pkg/volume/fc/disk_manager.go @@ -21,7 +21,7 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/util" diff --git a/pkg/volume/fc/fc.go b/pkg/volume/fc/fc.go index 99329ebf480..ef605b64f45 100644 --- a/pkg/volume/fc/fc.go +++ b/pkg/volume/fc/fc.go @@ -24,8 +24,8 @@ import ( "strings" "k8s.io/klog/v2" + "k8s.io/mount-utils" utilexec "k8s.io/utils/exec" - "k8s.io/utils/mount" utilstrings "k8s.io/utils/strings" v1 "k8s.io/api/core/v1" diff --git a/pkg/volume/fc/fc_test.go b/pkg/volume/fc/fc_test.go index 763081d8efb..c6f929bef63 100644 --- a/pkg/volume/fc/fc_test.go +++ b/pkg/volume/fc/fc_test.go @@ -24,8 +24,8 @@ import ( "strings" "testing" + "k8s.io/mount-utils" testingexec "k8s.io/utils/exec/testing" - "k8s.io/utils/mount" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/volume/fc/fc_util.go b/pkg/volume/fc/fc_util.go index a2bc31e3b3a..4e0b7ac921e 100644 --- a/pkg/volume/fc/fc_util.go +++ b/pkg/volume/fc/fc_util.go @@ -25,7 +25,7 @@ import ( "strings" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" "k8s.io/kubernetes/pkg/volume" volumeutil "k8s.io/kubernetes/pkg/volume/util" diff --git a/pkg/volume/flexvolume/BUILD b/pkg/volume/flexvolume/BUILD index eec4318788f..fc8c2ebc73f 100644 --- a/pkg/volume/flexvolume/BUILD +++ b/pkg/volume/flexvolume/BUILD @@ -36,10 +36,10 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/errors:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/github.com/fsnotify/fsnotify:go_default_library", "//vendor/k8s.io/klog/v2: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", ], ) @@ -66,12 +66,12 @@ 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", + "//staging/src/k8s.io/mount-utils:go_default_library", "//test/utils/harness:go_default_library", "//vendor/github.com/fsnotify/fsnotify:go_default_library", "//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", ], ) diff --git a/pkg/volume/flexvolume/attacher-defaults.go b/pkg/volume/flexvolume/attacher-defaults.go index 25146cb1b81..978d58c1634 100644 --- a/pkg/volume/flexvolume/attacher-defaults.go +++ b/pkg/volume/flexvolume/attacher-defaults.go @@ -20,7 +20,7 @@ import ( "time" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" "k8s.io/apimachinery/pkg/types" "k8s.io/kubernetes/pkg/volume" diff --git a/pkg/volume/flexvolume/detacher-defaults.go b/pkg/volume/flexvolume/detacher-defaults.go index e38dd820f10..4ef7be4aa17 100644 --- a/pkg/volume/flexvolume/detacher-defaults.go +++ b/pkg/volume/flexvolume/detacher-defaults.go @@ -20,7 +20,7 @@ import ( "time" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" "k8s.io/apimachinery/pkg/types" ) diff --git a/pkg/volume/flexvolume/detacher.go b/pkg/volume/flexvolume/detacher.go index a18f7be57e0..3457c108b1b 100644 --- a/pkg/volume/flexvolume/detacher.go +++ b/pkg/volume/flexvolume/detacher.go @@ -21,7 +21,7 @@ import ( "os" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" "k8s.io/apimachinery/pkg/types" "k8s.io/kubernetes/pkg/volume" diff --git a/pkg/volume/flexvolume/mounter_test.go b/pkg/volume/flexvolume/mounter_test.go index 4e806c90c9f..5a110e37224 100644 --- a/pkg/volume/flexvolume/mounter_test.go +++ b/pkg/volume/flexvolume/mounter_test.go @@ -19,7 +19,7 @@ package flexvolume import ( "testing" - "k8s.io/utils/mount" + "k8s.io/mount-utils" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/volume/flexvolume/plugin.go b/pkg/volume/flexvolume/plugin.go index 73f6e2c7153..961afc2a189 100644 --- a/pkg/volume/flexvolume/plugin.go +++ b/pkg/volume/flexvolume/plugin.go @@ -28,8 +28,8 @@ import ( "k8s.io/klog/v2" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/util" + "k8s.io/mount-utils" "k8s.io/utils/exec" - "k8s.io/utils/mount" utilstrings "k8s.io/utils/strings" ) diff --git a/pkg/volume/flexvolume/unmounter-defaults.go b/pkg/volume/flexvolume/unmounter-defaults.go index b449617dff8..6738509b6fa 100644 --- a/pkg/volume/flexvolume/unmounter-defaults.go +++ b/pkg/volume/flexvolume/unmounter-defaults.go @@ -18,7 +18,7 @@ package flexvolume import ( "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" ) type unmounterDefaults flexVolumeUnmounter diff --git a/pkg/volume/flexvolume/unmounter.go b/pkg/volume/flexvolume/unmounter.go index 8dcdf9d351b..ae0fbc7e677 100644 --- a/pkg/volume/flexvolume/unmounter.go +++ b/pkg/volume/flexvolume/unmounter.go @@ -21,8 +21,8 @@ import ( "os" "k8s.io/klog/v2" + "k8s.io/mount-utils" "k8s.io/utils/exec" - "k8s.io/utils/mount" "k8s.io/kubernetes/pkg/volume" ) diff --git a/pkg/volume/flexvolume/unmounter_test.go b/pkg/volume/flexvolume/unmounter_test.go index 41c07433558..565bddbd86f 100644 --- a/pkg/volume/flexvolume/unmounter_test.go +++ b/pkg/volume/flexvolume/unmounter_test.go @@ -19,7 +19,7 @@ package flexvolume import ( "testing" - "k8s.io/utils/mount" + "k8s.io/mount-utils" "k8s.io/apimachinery/pkg/types" "k8s.io/kubernetes/test/utils/harness" diff --git a/pkg/volume/flexvolume/util.go b/pkg/volume/flexvolume/util.go index 4be464e43e3..59e437a9018 100644 --- a/pkg/volume/flexvolume/util.go +++ b/pkg/volume/flexvolume/util.go @@ -22,7 +22,7 @@ import ( "os" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/util" diff --git a/pkg/volume/flexvolume/volume.go b/pkg/volume/flexvolume/volume.go index 5f0c47542b4..9b96706c72a 100644 --- a/pkg/volume/flexvolume/volume.go +++ b/pkg/volume/flexvolume/volume.go @@ -17,7 +17,7 @@ limitations under the License. package flexvolume import ( - "k8s.io/utils/mount" + "k8s.io/mount-utils" utilstrings "k8s.io/utils/strings" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/volume/flocker/BUILD b/pkg/volume/flocker/BUILD index 42f2b54f4c0..d5f8bfbe1ed 100644 --- a/pkg/volume/flocker/BUILD +++ b/pkg/volume/flocker/BUILD @@ -25,9 +25,9 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/rand:go_default_library", "//staging/src/k8s.io/cloud-provider/volume/helpers:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/github.com/clusterhq/flocker-go:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", "//vendor/k8s.io/utils/strings:go_default_library", ], ) @@ -47,9 +47,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", + "//staging/src/k8s.io/mount-utils: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", ], ) diff --git a/pkg/volume/flocker/flocker.go b/pkg/volume/flocker/flocker.go index 65e6377b47a..d527be5cb9c 100644 --- a/pkg/volume/flocker/flocker.go +++ b/pkg/volume/flocker/flocker.go @@ -24,7 +24,7 @@ import ( flockerapi "github.com/clusterhq/flocker-go" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" utilstrings "k8s.io/utils/strings" v1 "k8s.io/api/core/v1" diff --git a/pkg/volume/flocker/flocker_test.go b/pkg/volume/flocker/flocker_test.go index f2cb799b29b..23023193171 100644 --- a/pkg/volume/flocker/flocker_test.go +++ b/pkg/volume/flocker/flocker_test.go @@ -23,7 +23,7 @@ import ( flockerapi "github.com/clusterhq/flocker-go" "github.com/stretchr/testify/assert" - "k8s.io/utils/mount" + "k8s.io/mount-utils" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/volume/gcepd/BUILD b/pkg/volume/gcepd/BUILD index b2acce05a39..a7a240e641b 100644 --- a/pkg/volume/gcepd/BUILD +++ b/pkg/volume/gcepd/BUILD @@ -29,9 +29,9 @@ go_library( "//staging/src/k8s.io/cloud-provider/volume:go_default_library", "//staging/src/k8s.io/cloud-provider/volume/helpers:go_default_library", "//staging/src/k8s.io/legacy-cloud-providers/gce:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", "//vendor/k8s.io/utils/exec: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", ], @@ -60,8 +60,8 @@ go_test( "//staging/src/k8s.io/cloud-provider/volume:go_default_library", "//staging/src/k8s.io/cloud-provider/volume/helpers:go_default_library", "//staging/src/k8s.io/legacy-cloud-providers/gce:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", ], ) diff --git a/pkg/volume/gcepd/attacher.go b/pkg/volume/gcepd/attacher.go index 694a4394454..0629e62354a 100644 --- a/pkg/volume/gcepd/attacher.go +++ b/pkg/volume/gcepd/attacher.go @@ -30,8 +30,8 @@ import ( "time" "k8s.io/klog/v2" + "k8s.io/mount-utils" utilexec "k8s.io/utils/exec" - "k8s.io/utils/mount" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/volume/gcepd/gce_pd.go b/pkg/volume/gcepd/gce_pd.go index 6b193a3dfa2..0743c2cb6d6 100644 --- a/pkg/volume/gcepd/gce_pd.go +++ b/pkg/volume/gcepd/gce_pd.go @@ -27,7 +27,7 @@ import ( "strconv" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" utilstrings "k8s.io/utils/strings" v1 "k8s.io/api/core/v1" diff --git a/pkg/volume/gcepd/gce_pd_block.go b/pkg/volume/gcepd/gce_pd_block.go index ebab380608c..3811483c1e1 100644 --- a/pkg/volume/gcepd/gce_pd_block.go +++ b/pkg/volume/gcepd/gce_pd_block.go @@ -24,7 +24,7 @@ import ( "strconv" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" utilstrings "k8s.io/utils/strings" v1 "k8s.io/api/core/v1" diff --git a/pkg/volume/gcepd/gce_pd_test.go b/pkg/volume/gcepd/gce_pd_test.go index fee731a69c2..20141e716ce 100644 --- a/pkg/volume/gcepd/gce_pd_test.go +++ b/pkg/volume/gcepd/gce_pd_test.go @@ -26,7 +26,7 @@ import ( "sort" "testing" - "k8s.io/utils/mount" + "k8s.io/mount-utils" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/volume/gcepd/gce_util.go b/pkg/volume/gcepd/gce_util.go index 0d65003897e..c44285a5552 100644 --- a/pkg/volume/gcepd/gce_util.go +++ b/pkg/volume/gcepd/gce_util.go @@ -26,8 +26,8 @@ import ( "time" "k8s.io/klog/v2" + "k8s.io/mount-utils" "k8s.io/utils/exec" - "k8s.io/utils/mount" utilpath "k8s.io/utils/path" v1 "k8s.io/api/core/v1" diff --git a/pkg/volume/glusterfs/BUILD b/pkg/volume/glusterfs/BUILD index 0c6edcf7b43..d7929e7f453 100644 --- a/pkg/volume/glusterfs/BUILD +++ b/pkg/volume/glusterfs/BUILD @@ -29,10 +29,10 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//staging/src/k8s.io/cloud-provider/volume/helpers:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/github.com/heketi/heketi/client/api/go-client:go_default_library", "//vendor/github.com/heketi/heketi/pkg/glusterfs/api:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", "//vendor/k8s.io/utils/strings:go_default_library", ], ) @@ -54,8 +54,8 @@ go_test( "//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library", "//staging/src/k8s.io/client-go/testing:go_default_library", "//staging/src/k8s.io/client-go/util/testing:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/github.com/heketi/heketi/pkg/glusterfs/api:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", ], ) diff --git a/pkg/volume/glusterfs/glusterfs.go b/pkg/volume/glusterfs/glusterfs.go index 48388317a2b..21fb6668938 100644 --- a/pkg/volume/glusterfs/glusterfs.go +++ b/pkg/volume/glusterfs/glusterfs.go @@ -32,7 +32,7 @@ import ( gcli "github.com/heketi/heketi/client/api/go-client" gapi "github.com/heketi/heketi/pkg/glusterfs/api" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" utilstrings "k8s.io/utils/strings" v1 "k8s.io/api/core/v1" diff --git a/pkg/volume/glusterfs/glusterfs_test.go b/pkg/volume/glusterfs/glusterfs_test.go index 25e199d2ad9..332ee13dcc6 100644 --- a/pkg/volume/glusterfs/glusterfs_test.go +++ b/pkg/volume/glusterfs/glusterfs_test.go @@ -23,7 +23,7 @@ import ( "testing" gapi "github.com/heketi/heketi/pkg/glusterfs/api" - "k8s.io/utils/mount" + "k8s.io/mount-utils" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/volume/hostpath/BUILD b/pkg/volume/hostpath/BUILD index 0c2bd65bf3a..00e2c435e41 100644 --- a/pkg/volume/hostpath/BUILD +++ b/pkg/volume/hostpath/BUILD @@ -23,7 +23,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", "//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", ], ) diff --git a/pkg/volume/hostpath/host_path.go b/pkg/volume/hostpath/host_path.go index 3646a9d205f..71a07876e69 100644 --- a/pkg/volume/hostpath/host_path.go +++ b/pkg/volume/hostpath/host_path.go @@ -21,7 +21,7 @@ import ( "os" "regexp" - "k8s.io/utils/mount" + "k8s.io/mount-utils" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/volume/iscsi/BUILD b/pkg/volume/iscsi/BUILD index 8eeb58e0351..4510cb6d830 100644 --- a/pkg/volume/iscsi/BUILD +++ b/pkg/volume/iscsi/BUILD @@ -25,10 +25,10 @@ go_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", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/klog/v2: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,8 +49,8 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", "//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library", "//staging/src/k8s.io/client-go/util/testing:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/utils/exec/testing:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", ], ) diff --git a/pkg/volume/iscsi/attacher.go b/pkg/volume/iscsi/attacher.go index 50888f262fe..94b2f382932 100644 --- a/pkg/volume/iscsi/attacher.go +++ b/pkg/volume/iscsi/attacher.go @@ -22,8 +22,8 @@ import ( "time" "k8s.io/klog/v2" + "k8s.io/mount-utils" "k8s.io/utils/keymutex" - "k8s.io/utils/mount" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/volume/iscsi/disk_manager.go b/pkg/volume/iscsi/disk_manager.go index a06da76d100..7ebc85d8563 100644 --- a/pkg/volume/iscsi/disk_manager.go +++ b/pkg/volume/iscsi/disk_manager.go @@ -21,7 +21,7 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/util" diff --git a/pkg/volume/iscsi/iscsi.go b/pkg/volume/iscsi/iscsi.go index bec8b37be81..a4dd8cf3868 100644 --- a/pkg/volume/iscsi/iscsi.go +++ b/pkg/volume/iscsi/iscsi.go @@ -25,9 +25,9 @@ import ( "strings" "k8s.io/klog/v2" + "k8s.io/mount-utils" utilexec "k8s.io/utils/exec" "k8s.io/utils/keymutex" - "k8s.io/utils/mount" utilstrings "k8s.io/utils/strings" v1 "k8s.io/api/core/v1" diff --git a/pkg/volume/iscsi/iscsi_test.go b/pkg/volume/iscsi/iscsi_test.go index 8c058f782d3..476caafb0d3 100644 --- a/pkg/volume/iscsi/iscsi_test.go +++ b/pkg/volume/iscsi/iscsi_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" + "k8s.io/mount-utils" "k8s.io/utils/exec/testing" - "k8s.io/utils/mount" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/volume/iscsi/iscsi_util.go b/pkg/volume/iscsi/iscsi_util.go index 405ebf296eb..b47a2318c91 100644 --- a/pkg/volume/iscsi/iscsi_util.go +++ b/pkg/volume/iscsi/iscsi_util.go @@ -30,8 +30,8 @@ import ( "time" "k8s.io/klog/v2" + "k8s.io/mount-utils" utilexec "k8s.io/utils/exec" - "k8s.io/utils/mount" v1 "k8s.io/api/core/v1" "k8s.io/kubernetes/pkg/kubelet/config" diff --git a/pkg/volume/local/BUILD b/pkg/volume/local/BUILD index dbda937f912..c4492dcfbd4 100644 --- a/pkg/volume/local/BUILD +++ b/pkg/volume/local/BUILD @@ -18,9 +18,9 @@ go_library( "//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/tools/record:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/klog/v2: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", ], ) @@ -41,7 +41,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", + "//staging/src/k8s.io/mount-utils:go_default_library", ], "@io_bazel_rules_go//go/platform:darwin": [ "//pkg/volume:go_default_library", @@ -51,7 +51,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", + "//staging/src/k8s.io/mount-utils:go_default_library", ], "@io_bazel_rules_go//go/platform:ios": [ "//pkg/volume:go_default_library", @@ -61,7 +61,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", + "//staging/src/k8s.io/mount-utils:go_default_library", ], "@io_bazel_rules_go//go/platform:linux": [ "//pkg/volume:go_default_library", @@ -71,7 +71,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", + "//staging/src/k8s.io/mount-utils:go_default_library", ], "@io_bazel_rules_go//go/platform:windows": [ "//pkg/volume:go_default_library", @@ -81,7 +81,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", + "//staging/src/k8s.io/mount-utils:go_default_library", ], "//conditions:default": [], }), diff --git a/pkg/volume/local/local.go b/pkg/volume/local/local.go index 8e4ae6f55ca..b2c5fe7120e 100644 --- a/pkg/volume/local/local.go +++ b/pkg/volume/local/local.go @@ -34,8 +34,8 @@ import ( "k8s.io/kubernetes/pkg/volume/util" "k8s.io/kubernetes/pkg/volume/util/hostutil" "k8s.io/kubernetes/pkg/volume/validation" + "k8s.io/mount-utils" "k8s.io/utils/keymutex" - "k8s.io/utils/mount" utilstrings "k8s.io/utils/strings" ) diff --git a/pkg/volume/local/local_test.go b/pkg/volume/local/local_test.go index f76564af33f..488d2d2821c 100644 --- a/pkg/volume/local/local_test.go +++ b/pkg/volume/local/local_test.go @@ -33,7 +33,7 @@ import ( "k8s.io/kubernetes/pkg/volume" volumetest "k8s.io/kubernetes/pkg/volume/testing" "k8s.io/kubernetes/pkg/volume/util/hostutil" - "k8s.io/utils/mount" + "k8s.io/mount-utils" ) const ( diff --git a/pkg/volume/nfs/BUILD b/pkg/volume/nfs/BUILD index ad77dc5836c..0009671ebd0 100644 --- a/pkg/volume/nfs/BUILD +++ b/pkg/volume/nfs/BUILD @@ -20,8 +20,8 @@ go_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", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", "//vendor/k8s.io/utils/strings:go_default_library", ], ) @@ -38,7 +38,7 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", "//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/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", ], ) diff --git a/pkg/volume/nfs/nfs.go b/pkg/volume/nfs/nfs.go index 8aebd644e2a..1daf5e952d8 100644 --- a/pkg/volume/nfs/nfs.go +++ b/pkg/volume/nfs/nfs.go @@ -22,7 +22,7 @@ import ( "runtime" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" utilstrings "k8s.io/utils/strings" v1 "k8s.io/api/core/v1" diff --git a/pkg/volume/nfs/nfs_test.go b/pkg/volume/nfs/nfs_test.go index f2b0e519060..a53855ca9e6 100644 --- a/pkg/volume/nfs/nfs_test.go +++ b/pkg/volume/nfs/nfs_test.go @@ -21,7 +21,7 @@ import ( "os" "testing" - "k8s.io/utils/mount" + "k8s.io/mount-utils" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/volume/plugins.go b/pkg/volume/plugins.go index 9feccd04286..a0cb7e38974 100644 --- a/pkg/volume/plugins.go +++ b/pkg/volume/plugins.go @@ -23,8 +23,8 @@ import ( "sync" "k8s.io/klog/v2" + "k8s.io/mount-utils" "k8s.io/utils/exec" - "k8s.io/utils/mount" authenticationv1 "k8s.io/api/authentication/v1" v1 "k8s.io/api/core/v1" diff --git a/pkg/volume/portworx/BUILD b/pkg/volume/portworx/BUILD index 18ff868357c..a0cc829b303 100644 --- a/pkg/volume/portworx/BUILD +++ b/pkg/volume/portworx/BUILD @@ -17,7 +17,7 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/api/resource: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", + "//staging/src/k8s.io/mount-utils:go_default_library", ], ) @@ -38,13 +38,13 @@ go_library( "//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/cloud-provider/volume/helpers:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/github.com/libopenstorage/openstorage/api:go_default_library", "//vendor/github.com/libopenstorage/openstorage/api/client:go_default_library", "//vendor/github.com/libopenstorage/openstorage/api/client/volume:go_default_library", "//vendor/github.com/libopenstorage/openstorage/api/spec:go_default_library", "//vendor/github.com/libopenstorage/openstorage/volume:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", "//vendor/k8s.io/utils/strings:go_default_library", ], ) diff --git a/pkg/volume/portworx/portworx.go b/pkg/volume/portworx/portworx.go index a5daac8699e..a19f0442251 100644 --- a/pkg/volume/portworx/portworx.go +++ b/pkg/volume/portworx/portworx.go @@ -22,7 +22,7 @@ import ( volumeclient "github.com/libopenstorage/openstorage/api/client/volume" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" utilstrings "k8s.io/utils/strings" v1 "k8s.io/api/core/v1" diff --git a/pkg/volume/portworx/portworx_test.go b/pkg/volume/portworx/portworx_test.go index 02492f6d99d..f3d7a9fd7a5 100644 --- a/pkg/volume/portworx/portworx_test.go +++ b/pkg/volume/portworx/portworx_test.go @@ -22,7 +22,7 @@ import ( "path/filepath" "testing" - "k8s.io/utils/mount" + "k8s.io/mount-utils" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" diff --git a/pkg/volume/quobyte/BUILD b/pkg/volume/quobyte/BUILD index a50615bb32a..e0f6c52266c 100644 --- a/pkg/volume/quobyte/BUILD +++ b/pkg/volume/quobyte/BUILD @@ -22,10 +22,10 @@ go_library( "//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/cloud-provider/volume/helpers:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/github.com/google/uuid:go_default_library", "//vendor/github.com/quobyte/api:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", "//vendor/k8s.io/utils/strings:go_default_library", ], ) @@ -42,7 +42,7 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", "//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/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", ], ) diff --git a/pkg/volume/quobyte/quobyte.go b/pkg/volume/quobyte/quobyte.go index c6d059f5b0f..929639d8ad9 100644 --- a/pkg/volume/quobyte/quobyte.go +++ b/pkg/volume/quobyte/quobyte.go @@ -25,7 +25,7 @@ import ( "github.com/google/uuid" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" utilstrings "k8s.io/utils/strings" v1 "k8s.io/api/core/v1" diff --git a/pkg/volume/quobyte/quobyte_test.go b/pkg/volume/quobyte/quobyte_test.go index eb3ef2bbba8..ed7100cb179 100644 --- a/pkg/volume/quobyte/quobyte_test.go +++ b/pkg/volume/quobyte/quobyte_test.go @@ -21,7 +21,7 @@ import ( "os" "testing" - "k8s.io/utils/mount" + "k8s.io/mount-utils" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/volume/rbd/BUILD b/pkg/volume/rbd/BUILD index d8cb1bf3829..1788f14e522 100644 --- a/pkg/volume/rbd/BUILD +++ b/pkg/volume/rbd/BUILD @@ -31,9 +31,9 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//staging/src/k8s.io/cloud-provider/volume/helpers:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", "//vendor/k8s.io/utils/exec: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", ], @@ -53,7 +53,7 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library", "//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/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", ], ) diff --git a/pkg/volume/rbd/attacher.go b/pkg/volume/rbd/attacher.go index 3ed3f683bfb..a7da9f07e30 100644 --- a/pkg/volume/rbd/attacher.go +++ b/pkg/volume/rbd/attacher.go @@ -22,7 +22,7 @@ import ( "time" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/volume/rbd/disk_manager.go b/pkg/volume/rbd/disk_manager.go index 09e542595e4..8545b743c66 100644 --- a/pkg/volume/rbd/disk_manager.go +++ b/pkg/volume/rbd/disk_manager.go @@ -27,7 +27,7 @@ import ( "os" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" diff --git a/pkg/volume/rbd/rbd.go b/pkg/volume/rbd/rbd.go index 2de06c714fd..436c1c3f267 100644 --- a/pkg/volume/rbd/rbd.go +++ b/pkg/volume/rbd/rbd.go @@ -25,8 +25,8 @@ import ( dstrings "strings" "k8s.io/klog/v2" + "k8s.io/mount-utils" utilexec "k8s.io/utils/exec" - "k8s.io/utils/mount" utilstrings "k8s.io/utils/strings" v1 "k8s.io/api/core/v1" diff --git a/pkg/volume/rbd/rbd_test.go b/pkg/volume/rbd/rbd_test.go index 6fa06ff74b5..726fb5842b8 100644 --- a/pkg/volume/rbd/rbd_test.go +++ b/pkg/volume/rbd/rbd_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "k8s.io/utils/mount" + "k8s.io/mount-utils" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" diff --git a/pkg/volume/rbd/rbd_util.go b/pkg/volume/rbd/rbd_util.go index 4c001cb704b..f54924a25ed 100644 --- a/pkg/volume/rbd/rbd_util.go +++ b/pkg/volume/rbd/rbd_util.go @@ -33,8 +33,8 @@ import ( "time" "k8s.io/klog/v2" + "k8s.io/mount-utils" utilexec "k8s.io/utils/exec" - "k8s.io/utils/mount" utilpath "k8s.io/utils/path" v1 "k8s.io/api/core/v1" diff --git a/pkg/volume/scaleio/BUILD b/pkg/volume/scaleio/BUILD index d6aabc7d642..8f0a96e4457 100644 --- a/pkg/volume/scaleio/BUILD +++ b/pkg/volume/scaleio/BUILD @@ -49,12 +49,12 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library", "//staging/src/k8s.io/cloud-provider/volume/helpers:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/github.com/thecodeteam/goscaleio:go_default_library", "//vendor/github.com/thecodeteam/goscaleio/types/v1:go_default_library", "//vendor/k8s.io/klog/v2: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", ], ) diff --git a/pkg/volume/scaleio/sio_volume.go b/pkg/volume/scaleio/sio_volume.go index 337dba9cb0d..39434e2a9f0 100644 --- a/pkg/volume/scaleio/sio_volume.go +++ b/pkg/volume/scaleio/sio_volume.go @@ -24,7 +24,7 @@ import ( "strings" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" utilstrings "k8s.io/utils/strings" api "k8s.io/api/core/v1" diff --git a/pkg/volume/secret/BUILD b/pkg/volume/secret/BUILD index c4405c2a5e1..9ae55f0ac12 100644 --- a/pkg/volume/secret/BUILD +++ b/pkg/volume/secret/BUILD @@ -20,8 +20,8 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/api/errors: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", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", "//vendor/k8s.io/utils/strings:go_default_library", ], ) diff --git a/pkg/volume/secret/secret.go b/pkg/volume/secret/secret.go index 98d067a6eb8..c033cd57a18 100644 --- a/pkg/volume/secret/secret.go +++ b/pkg/volume/secret/secret.go @@ -20,7 +20,7 @@ import ( "fmt" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" utilstrings "k8s.io/utils/strings" v1 "k8s.io/api/core/v1" diff --git a/pkg/volume/storageos/BUILD b/pkg/volume/storageos/BUILD index f66bb22b190..bd114dd5af3 100644 --- a/pkg/volume/storageos/BUILD +++ b/pkg/volume/storageos/BUILD @@ -23,11 +23,11 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//staging/src/k8s.io/cloud-provider/volume/helpers:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/github.com/storageos/go-api:go_default_library", "//vendor/github.com/storageos/go-api/types:go_default_library", "//vendor/k8s.io/klog/v2: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", ], ) @@ -47,9 +47,9 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", "//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library", "//staging/src/k8s.io/client-go/util/testing:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/github.com/storageos/go-api/types:go_default_library", "//vendor/k8s.io/utils/exec/testing:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", ], ) diff --git a/pkg/volume/storageos/storageos.go b/pkg/volume/storageos/storageos.go index 7243eaccc5c..ca2eaa59324 100644 --- a/pkg/volume/storageos/storageos.go +++ b/pkg/volume/storageos/storageos.go @@ -24,8 +24,8 @@ import ( "strings" "k8s.io/klog/v2" + "k8s.io/mount-utils" utilexec "k8s.io/utils/exec" - "k8s.io/utils/mount" utilstrings "k8s.io/utils/strings" v1 "k8s.io/api/core/v1" diff --git a/pkg/volume/storageos/storageos_test.go b/pkg/volume/storageos/storageos_test.go index 727c568675a..604b5c8b1da 100644 --- a/pkg/volume/storageos/storageos_test.go +++ b/pkg/volume/storageos/storageos_test.go @@ -23,8 +23,8 @@ import ( "path/filepath" "testing" + "k8s.io/mount-utils" "k8s.io/utils/exec/testing" - "k8s.io/utils/mount" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/volume/storageos/storageos_util_test.go b/pkg/volume/storageos/storageos_util_test.go index 2c00adce646..0d08f779538 100644 --- a/pkg/volume/storageos/storageos_util_test.go +++ b/pkg/volume/storageos/storageos_util_test.go @@ -22,7 +22,7 @@ import ( "testing" storageostypes "github.com/storageos/go-api/types" - "k8s.io/utils/mount" + "k8s.io/mount-utils" v1 "k8s.io/api/core/v1" utiltesting "k8s.io/client-go/util/testing" diff --git a/pkg/volume/testing/BUILD b/pkg/volume/testing/BUILD index 58007e7f2e6..62e8aa98ce0 100644 --- a/pkg/volume/testing/BUILD +++ b/pkg/volume/testing/BUILD @@ -34,10 +34,10 @@ go_library( "//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/cloud-provider:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/github.com/stretchr/testify/mock: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", "//vendor/k8s.io/utils/strings:go_default_library", ], ) diff --git a/pkg/volume/testing/testing.go b/pkg/volume/testing/testing.go index f19f913860b..9f6b4190107 100644 --- a/pkg/volume/testing/testing.go +++ b/pkg/volume/testing/testing.go @@ -27,9 +27,9 @@ import ( "testing" "time" + "k8s.io/mount-utils" "k8s.io/utils/exec" testingexec "k8s.io/utils/exec/testing" - "k8s.io/utils/mount" utilstrings "k8s.io/utils/strings" authenticationv1 "k8s.io/api/authentication/v1" diff --git a/pkg/volume/util/BUILD b/pkg/volume/util/BUILD index 8cb989f7ae7..d0095a9abf9 100644 --- a/pkg/volume/util/BUILD +++ b/pkg/volume/util/BUILD @@ -41,9 +41,9 @@ go_library( "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//staging/src/k8s.io/component-base/metrics:go_default_library", "//staging/src/k8s.io/component-base/metrics/legacyregistry:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/klog/v2: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", ], ) diff --git a/pkg/volume/util/fsquota/BUILD b/pkg/volume/util/fsquota/BUILD index dddf0a26ef6..ef48ca78a79 100644 --- a/pkg/volume/util/fsquota/BUILD +++ b/pkg/volume/util/fsquota/BUILD @@ -15,7 +15,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", ] + select({ "@io_bazel_rules_go//go/platform:android": [ "//pkg/volume/util/fsquota/common:go_default_library", @@ -45,7 +45,7 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", "//staging/src/k8s.io/component-base/featuregate/testing:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", ], "@io_bazel_rules_go//go/platform:linux": [ "//pkg/features:go_default_library", @@ -54,7 +54,7 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", "//staging/src/k8s.io/component-base/featuregate/testing:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", ], "//conditions:default": [], }), diff --git a/pkg/volume/util/fsquota/quota.go b/pkg/volume/util/fsquota/quota.go index 40e30d5d66c..fbd29fba735 100644 --- a/pkg/volume/util/fsquota/quota.go +++ b/pkg/volume/util/fsquota/quota.go @@ -17,7 +17,7 @@ limitations under the License. package fsquota import ( - "k8s.io/utils/mount" + "k8s.io/mount-utils" "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/volume/util/fsquota/quota_linux.go b/pkg/volume/util/fsquota/quota_linux.go index 59470bfcb36..36c7964603d 100644 --- a/pkg/volume/util/fsquota/quota_linux.go +++ b/pkg/volume/util/fsquota/quota_linux.go @@ -26,7 +26,7 @@ import ( "sync" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/types" @@ -111,7 +111,7 @@ func clearBackingDev(path string) { // Breaking this up helps with testing func detectMountpointInternal(m mount.Interface, path string) (string, error) { for path != "" && path != "/" { - // per k8s.io/utils/mount/mount_linux this detects all but + // per k8s.io/mount-utils/mount_linux this detects all but // a bind mount from one part of a mount to another. // For our purposes that's fine; we simply want the "true" // mount point diff --git a/pkg/volume/util/fsquota/quota_linux_test.go b/pkg/volume/util/fsquota/quota_linux_test.go index dd69c8979d8..7c1d86f72cc 100644 --- a/pkg/volume/util/fsquota/quota_linux_test.go +++ b/pkg/volume/util/fsquota/quota_linux_test.go @@ -25,7 +25,7 @@ import ( "strings" "testing" - "k8s.io/utils/mount" + "k8s.io/mount-utils" "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/volume/util/fsquota/quota_unsupported.go b/pkg/volume/util/fsquota/quota_unsupported.go index a192122b712..b8c4ead4e3e 100644 --- a/pkg/volume/util/fsquota/quota_unsupported.go +++ b/pkg/volume/util/fsquota/quota_unsupported.go @@ -21,7 +21,7 @@ package fsquota import ( "errors" - "k8s.io/utils/mount" + "k8s.io/mount-utils" "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/volume/util/hostutil/BUILD b/pkg/volume/util/hostutil/BUILD index 1ac512b6164..57b546e7611 100644 --- a/pkg/volume/util/hostutil/BUILD +++ b/pkg/volume/util/hostutil/BUILD @@ -12,7 +12,7 @@ go_library( importpath = "k8s.io/kubernetes/pkg/volume/util/hostutil", visibility = ["//visibility:public"], deps = [ - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", ] + select({ "@io_bazel_rules_go//go/platform:android": [ "//vendor/golang.org/x/sys/unix:go_default_library", diff --git a/pkg/volume/util/hostutil/fake_hostutil.go b/pkg/volume/util/hostutil/fake_hostutil.go index 688e28ecc87..cc5fe628af6 100644 --- a/pkg/volume/util/hostutil/fake_hostutil.go +++ b/pkg/volume/util/hostutil/fake_hostutil.go @@ -21,7 +21,7 @@ import ( "os" "sync" - "k8s.io/utils/mount" + "k8s.io/mount-utils" ) // FakeHostUtil is a fake HostUtils implementation for testing diff --git a/pkg/volume/util/hostutil/hostutil.go b/pkg/volume/util/hostutil/hostutil.go index ceb067dbf04..561278b7d8b 100644 --- a/pkg/volume/util/hostutil/hostutil.go +++ b/pkg/volume/util/hostutil/hostutil.go @@ -20,7 +20,7 @@ import ( "fmt" "os" - "k8s.io/utils/mount" + "k8s.io/mount-utils" ) // FileType enumerates the known set of possible file types. diff --git a/pkg/volume/util/hostutil/hostutil_linux.go b/pkg/volume/util/hostutil/hostutil_linux.go index b4856a70027..160d22c28ad 100644 --- a/pkg/volume/util/hostutil/hostutil_linux.go +++ b/pkg/volume/util/hostutil/hostutil_linux.go @@ -28,7 +28,7 @@ import ( "golang.org/x/sys/unix" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" utilpath "k8s.io/utils/path" ) diff --git a/pkg/volume/util/hostutil/hostutil_unsupported.go b/pkg/volume/util/hostutil/hostutil_unsupported.go index 303da14965c..132ea3d0907 100644 --- a/pkg/volume/util/hostutil/hostutil_unsupported.go +++ b/pkg/volume/util/hostutil/hostutil_unsupported.go @@ -22,7 +22,7 @@ import ( "errors" "os" - "k8s.io/utils/mount" + "k8s.io/mount-utils" ) // HostUtil is an HostUtils implementation that allows compilation on diff --git a/pkg/volume/util/hostutil/hostutil_windows.go b/pkg/volume/util/hostutil/hostutil_windows.go index 79845aa938c..bd44dc54a44 100644 --- a/pkg/volume/util/hostutil/hostutil_windows.go +++ b/pkg/volume/util/hostutil/hostutil_windows.go @@ -26,7 +26,7 @@ import ( "strings" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" utilpath "k8s.io/utils/path" ) diff --git a/pkg/volume/util/operationexecutor/BUILD b/pkg/volume/util/operationexecutor/BUILD index e880a055fa4..c1fd890d6cf 100644 --- a/pkg/volume/util/operationexecutor/BUILD +++ b/pkg/volume/util/operationexecutor/BUILD @@ -33,8 +33,8 @@ go_library( "//staging/src/k8s.io/client-go/tools/record:go_default_library", "//staging/src/k8s.io/cloud-provider/volume/errors:go_default_library", "//staging/src/k8s.io/csi-translation-lib:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", ], ) diff --git a/pkg/volume/util/operationexecutor/operation_executor.go b/pkg/volume/util/operationexecutor/operation_executor.go index e4c287381d4..2d93c16c907 100644 --- a/pkg/volume/util/operationexecutor/operation_executor.go +++ b/pkg/volume/util/operationexecutor/operation_executor.go @@ -25,7 +25,7 @@ import ( "time" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" diff --git a/pkg/volume/util/resize_util.go b/pkg/volume/util/resize_util.go index 3dbffe19022..59d9c2a90c1 100644 --- a/pkg/volume/util/resize_util.go +++ b/pkg/volume/util/resize_util.go @@ -21,7 +21,7 @@ import ( "encoding/json" "fmt" - "k8s.io/utils/mount" + "k8s.io/mount-utils" "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/meta" diff --git a/pkg/volume/util/subpath/BUILD b/pkg/volume/util/subpath/BUILD index ff6b29374e0..37908f614db 100644 --- a/pkg/volume/util/subpath/BUILD +++ b/pkg/volume/util/subpath/BUILD @@ -12,68 +12,68 @@ go_library( visibility = ["//visibility:public"], deps = select({ "@io_bazel_rules_go//go/platform:aix": [ - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/utils/nsenter:go_default_library", ], "@io_bazel_rules_go//go/platform:android": [ "//pkg/volume/util/hostutil:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/golang.org/x/sys/unix:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", ], "@io_bazel_rules_go//go/platform:darwin": [ - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/utils/nsenter:go_default_library", ], "@io_bazel_rules_go//go/platform:dragonfly": [ - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/utils/nsenter:go_default_library", ], "@io_bazel_rules_go//go/platform:freebsd": [ - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/utils/nsenter:go_default_library", ], "@io_bazel_rules_go//go/platform:illumos": [ - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/utils/nsenter:go_default_library", ], "@io_bazel_rules_go//go/platform:ios": [ - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/utils/nsenter:go_default_library", ], "@io_bazel_rules_go//go/platform:js": [ - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/utils/nsenter:go_default_library", ], "@io_bazel_rules_go//go/platform:linux": [ "//pkg/volume/util/hostutil:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/golang.org/x/sys/unix:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", ], "@io_bazel_rules_go//go/platform:nacl": [ - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/utils/nsenter:go_default_library", ], "@io_bazel_rules_go//go/platform:netbsd": [ - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/utils/nsenter:go_default_library", ], "@io_bazel_rules_go//go/platform:openbsd": [ - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/utils/nsenter:go_default_library", ], "@io_bazel_rules_go//go/platform:plan9": [ - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/utils/nsenter:go_default_library", ], "@io_bazel_rules_go//go/platform:solaris": [ - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/utils/nsenter:go_default_library", ], "@io_bazel_rules_go//go/platform:windows": [ + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", "//vendor/k8s.io/utils/nsenter:go_default_library", ], "//conditions:default": [], @@ -89,12 +89,12 @@ go_test( embed = [":go_default_library"], deps = select({ "@io_bazel_rules_go//go/platform:android": [ + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", ], "@io_bazel_rules_go//go/platform:linux": [ + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", ], "@io_bazel_rules_go//go/platform:windows": [ "//vendor/github.com/stretchr/testify/assert:go_default_library", diff --git a/pkg/volume/util/subpath/subpath_linux.go b/pkg/volume/util/subpath/subpath_linux.go index 706e1f83da8..b4595090dee 100644 --- a/pkg/volume/util/subpath/subpath_linux.go +++ b/pkg/volume/util/subpath/subpath_linux.go @@ -30,7 +30,7 @@ import ( "golang.org/x/sys/unix" "k8s.io/klog/v2" "k8s.io/kubernetes/pkg/volume/util/hostutil" - "k8s.io/utils/mount" + "k8s.io/mount-utils" ) const ( diff --git a/pkg/volume/util/subpath/subpath_linux_test.go b/pkg/volume/util/subpath/subpath_linux_test.go index f57bea0a540..00a54e501ec 100644 --- a/pkg/volume/util/subpath/subpath_linux_test.go +++ b/pkg/volume/util/subpath/subpath_linux_test.go @@ -30,7 +30,7 @@ import ( "testing" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" ) func TestSafeMakeDir(t *testing.T) { diff --git a/pkg/volume/util/subpath/subpath_unsupported.go b/pkg/volume/util/subpath/subpath_unsupported.go index 9b937adcfef..c9ff2bc072e 100644 --- a/pkg/volume/util/subpath/subpath_unsupported.go +++ b/pkg/volume/util/subpath/subpath_unsupported.go @@ -22,7 +22,7 @@ import ( "errors" "os" - "k8s.io/utils/mount" + "k8s.io/mount-utils" "k8s.io/utils/nsenter" ) diff --git a/pkg/volume/util/subpath/subpath_windows.go b/pkg/volume/util/subpath/subpath_windows.go index 2e08449c889..0e9367eaf00 100644 --- a/pkg/volume/util/subpath/subpath_windows.go +++ b/pkg/volume/util/subpath/subpath_windows.go @@ -27,7 +27,7 @@ import ( "syscall" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" "k8s.io/utils/nsenter" ) diff --git a/pkg/volume/util/types/BUILD b/pkg/volume/util/types/BUILD index e6ba8207892..37f1f0f121d 100644 --- a/pkg/volume/util/types/BUILD +++ b/pkg/volume/util/types/BUILD @@ -13,7 +13,7 @@ go_library( deps = [ "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/runtime:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", ], ) @@ -34,5 +34,5 @@ go_test( name = "go_default_test", srcs = ["types_test.go"], embed = [":go_default_library"], - deps = ["//vendor/k8s.io/utils/mount:go_default_library"], + deps = ["//staging/src/k8s.io/mount-utils:go_default_library"], ) diff --git a/pkg/volume/util/types/types.go b/pkg/volume/util/types/types.go index a06e5e18295..9a9eb2f81fe 100644 --- a/pkg/volume/util/types/types.go +++ b/pkg/volume/util/types/types.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/runtime" - "k8s.io/utils/mount" + "k8s.io/mount-utils" ) // UniquePodName defines the type to key pods off of diff --git a/pkg/volume/util/types/types_test.go b/pkg/volume/util/types/types_test.go index 7a3eebb38ae..9943b1af060 100644 --- a/pkg/volume/util/types/types_test.go +++ b/pkg/volume/util/types/types_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - "k8s.io/utils/mount" + "k8s.io/mount-utils" ) func TestErrorTypes(t *testing.T) { diff --git a/pkg/volume/util/util.go b/pkg/volume/util/util.go index bb54c038e78..77647c990b2 100644 --- a/pkg/volume/util/util.go +++ b/pkg/volume/util/util.go @@ -27,8 +27,8 @@ import ( "strings" "k8s.io/klog/v2" + "k8s.io/mount-utils" utilexec "k8s.io/utils/exec" - "k8s.io/utils/mount" utilstrings "k8s.io/utils/strings" v1 "k8s.io/api/core/v1" diff --git a/pkg/volume/util/volumepathhandler/BUILD b/pkg/volume/util/volumepathhandler/BUILD index 7d0d82fee55..c9a3bde2666 100644 --- a/pkg/volume/util/volumepathhandler/BUILD +++ b/pkg/volume/util/volumepathhandler/BUILD @@ -11,9 +11,9 @@ go_library( visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/klog/v2: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/golang.org/x/sys/unix:go_default_library", diff --git a/pkg/volume/util/volumepathhandler/volume_path_handler.go b/pkg/volume/util/volumepathhandler/volume_path_handler.go index 1b3a8f936aa..ce63b6a1bb4 100644 --- a/pkg/volume/util/volumepathhandler/volume_path_handler.go +++ b/pkg/volume/util/volumepathhandler/volume_path_handler.go @@ -23,8 +23,8 @@ import ( "path/filepath" "k8s.io/klog/v2" + "k8s.io/mount-utils" utilexec "k8s.io/utils/exec" - "k8s.io/utils/mount" "k8s.io/apimachinery/pkg/types" ) diff --git a/pkg/volume/vsphere_volume/BUILD b/pkg/volume/vsphere_volume/BUILD index d4828ec3580..7f53753eb67 100644 --- a/pkg/volume/vsphere_volume/BUILD +++ b/pkg/volume/vsphere_volume/BUILD @@ -33,9 +33,9 @@ go_library( "//staging/src/k8s.io/cloud-provider/volume/helpers:go_default_library", "//staging/src/k8s.io/legacy-cloud-providers/vsphere:go_default_library", "//staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/klog/v2: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", ], ) @@ -59,8 +59,8 @@ go_test( "//staging/src/k8s.io/cloud-provider/fake:go_default_library", "//staging/src/k8s.io/legacy-cloud-providers/vsphere:go_default_library", "//staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", ], ) diff --git a/pkg/volume/vsphere_volume/attacher.go b/pkg/volume/vsphere_volume/attacher.go index 7dd0a042c8e..a07ddce489e 100644 --- a/pkg/volume/vsphere_volume/attacher.go +++ b/pkg/volume/vsphere_volume/attacher.go @@ -26,8 +26,8 @@ import ( "time" "k8s.io/klog/v2" + "k8s.io/mount-utils" "k8s.io/utils/keymutex" - "k8s.io/utils/mount" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/volume/vsphere_volume/vsphere_volume.go b/pkg/volume/vsphere_volume/vsphere_volume.go index 10f146baf6e..1b1b9d0e1f1 100644 --- a/pkg/volume/vsphere_volume/vsphere_volume.go +++ b/pkg/volume/vsphere_volume/vsphere_volume.go @@ -27,7 +27,7 @@ import ( utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" utilstrings "k8s.io/utils/strings" v1 "k8s.io/api/core/v1" diff --git a/pkg/volume/vsphere_volume/vsphere_volume_block.go b/pkg/volume/vsphere_volume/vsphere_volume_block.go index 1ca2fd749c2..f1208049069 100644 --- a/pkg/volume/vsphere_volume/vsphere_volume_block.go +++ b/pkg/volume/vsphere_volume/vsphere_volume_block.go @@ -24,7 +24,7 @@ import ( "strings" "k8s.io/klog/v2" - "k8s.io/utils/mount" + "k8s.io/mount-utils" utilstrings "k8s.io/utils/strings" v1 "k8s.io/api/core/v1" diff --git a/pkg/volume/vsphere_volume/vsphere_volume_test.go b/pkg/volume/vsphere_volume/vsphere_volume_test.go index ae59c319813..5e85218e1d8 100644 --- a/pkg/volume/vsphere_volume/vsphere_volume_test.go +++ b/pkg/volume/vsphere_volume/vsphere_volume_test.go @@ -24,7 +24,7 @@ import ( "path/filepath" "testing" - "k8s.io/utils/mount" + "k8s.io/mount-utils" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/volume/vsphere_volume/vsphere_volume_util_linux.go b/pkg/volume/vsphere_volume/vsphere_volume_util_linux.go index 3ad003b880f..2ca2903deab 100644 --- a/pkg/volume/vsphere_volume/vsphere_volume_util_linux.go +++ b/pkg/volume/vsphere_volume/vsphere_volume_util_linux.go @@ -22,7 +22,7 @@ package vsphere_volume import ( "fmt" - "k8s.io/utils/mount" + "k8s.io/mount-utils" ) func verifyDevicePath(path string) (string, error) { diff --git a/test/e2e_node/BUILD b/test/e2e_node/BUILD index 5c529dd6275..06bbbfb8ec4 100644 --- a/test/e2e_node/BUILD +++ b/test/e2e_node/BUILD @@ -73,6 +73,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//test/e2e/framework/perf:go_default_library", "//test/e2e/framework/pod:go_default_library", "//test/e2e/perftype:go_default_library", @@ -81,7 +82,6 @@ go_library( "//vendor/github.com/google/cadvisor/client/v2:go_default_library", "//vendor/github.com/google/cadvisor/info/v2:go_default_library", "//vendor/github.com/opencontainers/runc/libcontainer/cgroups:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", ], "@io_bazel_rules_go//go/platform:linux": [ "//pkg/util/procfs:go_default_library", @@ -92,6 +92,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//test/e2e/framework/perf:go_default_library", "//test/e2e/framework/pod:go_default_library", "//test/e2e/perftype:go_default_library", @@ -100,7 +101,6 @@ go_library( "//vendor/github.com/google/cadvisor/client/v2:go_default_library", "//vendor/github.com/google/cadvisor/info/v2:go_default_library", "//vendor/github.com/opencontainers/runc/libcontainer/cgroups:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", ], "//conditions:default": [], }), @@ -196,6 +196,7 @@ go_test( "//staging/src/k8s.io/cri-api/pkg/apis:go_default_library", "//staging/src/k8s.io/cri-api/pkg/apis/runtime/v1alpha2:go_default_library", "//staging/src/k8s.io/kubelet/pkg/apis/podresources/v1alpha1:go_default_library", + "//staging/src/k8s.io/mount-utils:go_default_library", "//test/e2e/common:go_default_library", "//test/e2e/framework:go_default_library", "//test/e2e/framework/gpu:go_default_library", @@ -221,7 +222,6 @@ go_test( "//vendor/github.com/onsi/gomega/types:go_default_library", "//vendor/github.com/prometheus/common/model:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", - "//vendor/k8s.io/utils/mount:go_default_library", ] + select({ "@io_bazel_rules_go//go/platform:android": [ "//pkg/kubelet/stats/pidlimit:go_default_library", diff --git a/test/e2e_node/quota_lsci_test.go b/test/e2e_node/quota_lsci_test.go index 25f3ef3958a..b2b82b9b664 100644 --- a/test/e2e_node/quota_lsci_test.go +++ b/test/e2e_node/quota_lsci_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/kubernetes/test/e2e/framework" e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" imageutils "k8s.io/kubernetes/test/utils/image" - "k8s.io/utils/mount" + "k8s.io/mount-utils" "github.com/onsi/ginkgo" ) diff --git a/test/e2e_node/util_xfs_linux.go b/test/e2e_node/util_xfs_linux.go index b3d387b4a13..a926fe7cc33 100644 --- a/test/e2e_node/util_xfs_linux.go +++ b/test/e2e_node/util_xfs_linux.go @@ -22,7 +22,7 @@ import ( "path/filepath" "syscall" - "k8s.io/utils/mount" + "k8s.io/mount-utils" ) func detectMountpoint(m mount.Interface, path string) string { diff --git a/vendor/modules.txt b/vendor/modules.txt index 9a1c384a327..757d3c97b2c 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -2429,6 +2429,9 @@ k8s.io/metrics/pkg/client/custom_metrics/fake k8s.io/metrics/pkg/client/custom_metrics/scheme k8s.io/metrics/pkg/client/external_metrics k8s.io/metrics/pkg/client/external_metrics/fake +# k8s.io/mount-utils v0.0.0 => ./staging/src/k8s.io/mount-utils +## explicit +k8s.io/mount-utils # k8s.io/mount-utils => ./staging/src/k8s.io/mount-utils # k8s.io/sample-apiserver v0.0.0 => ./staging/src/k8s.io/sample-apiserver ## explicit