diff --git a/pkg/controller/.import-restrictions b/pkg/controller/.import-restrictions index bb88f40d2e..9749301c11 100644 --- a/pkg/controller/.import-restrictions +++ b/pkg/controller/.import-restrictions @@ -286,7 +286,6 @@ "k8s.io/kubernetes/pkg/util/node", "k8s.io/kubernetes/pkg/util/reflector/prometheus", "k8s.io/kubernetes/pkg/util/slice", - "k8s.io/kubernetes/pkg/util/strings", "k8s.io/kubernetes/pkg/util/system", "k8s.io/kubernetes/pkg/util/taints", "k8s.io/kubernetes/pkg/util/workqueue/prometheus", @@ -341,7 +340,8 @@ "k8s.io/utils/integer", "k8s.io/utils/io", "k8s.io/utils/pointer", - "k8s.io/utils/exec" + "k8s.io/utils/exec", + "k8s.io/utils/strings" ] }, { diff --git a/pkg/controller/volume/attachdetach/reconciler/BUILD b/pkg/controller/volume/attachdetach/reconciler/BUILD index b09344c04f..cb047fc936 100644 --- a/pkg/controller/volume/attachdetach/reconciler/BUILD +++ b/pkg/controller/volume/attachdetach/reconciler/BUILD @@ -35,7 +35,6 @@ go_test( "//pkg/controller/volume/attachdetach/cache:go_default_library", "//pkg/controller/volume/attachdetach/statusupdater:go_default_library", "//pkg/controller/volume/attachdetach/testing:go_default_library", - "//pkg/util/strings:go_default_library", "//pkg/volume/testing:go_default_library", "//pkg/volume/util/operationexecutor:go_default_library", "//pkg/volume/util/types:go_default_library", @@ -44,6 +43,7 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//staging/src/k8s.io/client-go/informers:go_default_library", "//staging/src/k8s.io/client-go/tools/record:go_default_library", + "//vendor/k8s.io/utils/strings:go_default_library", ], ) diff --git a/pkg/controller/volume/attachdetach/reconciler/reconciler_test.go b/pkg/controller/volume/attachdetach/reconciler/reconciler_test.go index a16a7af859..8c83f77d0e 100644 --- a/pkg/controller/volume/attachdetach/reconciler/reconciler_test.go +++ b/pkg/controller/volume/attachdetach/reconciler/reconciler_test.go @@ -29,10 +29,10 @@ import ( "k8s.io/kubernetes/pkg/controller/volume/attachdetach/cache" "k8s.io/kubernetes/pkg/controller/volume/attachdetach/statusupdater" controllervolumetesting "k8s.io/kubernetes/pkg/controller/volume/attachdetach/testing" - stringutil "k8s.io/kubernetes/pkg/util/strings" volumetesting "k8s.io/kubernetes/pkg/volume/testing" "k8s.io/kubernetes/pkg/volume/util/operationexecutor" "k8s.io/kubernetes/pkg/volume/util/types" + utilsstrings "k8s.io/utils/strings" ) const ( @@ -738,7 +738,7 @@ func Test_ReportMultiAttachError(t *testing.T) { volumeSpec := controllervolumetesting.GetTestVolumeSpec(string(volumeName), volumeName) volumeSpec.PersistentVolume.Spec.AccessModes = []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce} uid := string(n.name) + "-" + podName // unique UID - namespace, name := stringutil.SplitQualifiedName(podName) + namespace, name := utilsstrings.SplitQualifiedName(podName) pod := controllervolumetesting.NewPod(uid, name) pod.Namespace = namespace _, err := dsw.AddPod(types.UniquePodName(uid), pod, volumeSpec, n.name) diff --git a/pkg/kubelet/mountpod/BUILD b/pkg/kubelet/mountpod/BUILD index 411da640f2..bcb1961dd7 100644 --- a/pkg/kubelet/mountpod/BUILD +++ b/pkg/kubelet/mountpod/BUILD @@ -8,8 +8,8 @@ go_library( deps = [ "//pkg/kubelet/config:go_default_library", "//pkg/kubelet/pod:go_default_library", - "//pkg/util/strings:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", + "//vendor/k8s.io/utils/strings:go_default_library", ], ) diff --git a/pkg/kubelet/mountpod/mount_pod.go b/pkg/kubelet/mountpod/mount_pod.go index 6c7afda481..cf0e97ba4c 100644 --- a/pkg/kubelet/mountpod/mount_pod.go +++ b/pkg/kubelet/mountpod/mount_pod.go @@ -26,7 +26,7 @@ import ( "k8s.io/api/core/v1" "k8s.io/kubernetes/pkg/kubelet/config" kubepod "k8s.io/kubernetes/pkg/kubelet/pod" - "k8s.io/kubernetes/pkg/util/strings" + "k8s.io/utils/strings" ) // Manager is an interface that tracks pods with mount utilities for individual @@ -68,7 +68,7 @@ func NewManager(rootDirectory string, podManager kubepod.Manager) (Manager, erro func (m *basicManager) getVolumePluginRegistrationPath(pluginName string) string { // sanitize plugin name so it does not escape directory - safePluginName := strings.EscapePluginName(pluginName) + ".json" + safePluginName := strings.EscapeQualifiedName(pluginName) + ".json" return path.Join(m.registrationDirectory, safePluginName) } diff --git a/pkg/kubelet/volumemanager/reconciler/BUILD b/pkg/kubelet/volumemanager/reconciler/BUILD index ca88d62d7b..46865145d4 100644 --- a/pkg/kubelet/volumemanager/reconciler/BUILD +++ b/pkg/kubelet/volumemanager/reconciler/BUILD @@ -17,7 +17,6 @@ go_library( "//pkg/util/file:go_default_library", "//pkg/util/goroutinemap/exponentialbackoff:go_default_library", "//pkg/util/mount:go_default_library", - "//pkg/util/strings:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/util:go_default_library", "//pkg/volume/util/nestedpendingoperations:go_default_library", @@ -30,6 +29,7 @@ go_library( "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/utils/strings:go_default_library", ], ) diff --git a/pkg/kubelet/volumemanager/reconciler/reconciler.go b/pkg/kubelet/volumemanager/reconciler/reconciler.go index a28517d887..c02c9e0d5f 100644 --- a/pkg/kubelet/volumemanager/reconciler/reconciler.go +++ b/pkg/kubelet/volumemanager/reconciler/reconciler.go @@ -39,12 +39,12 @@ import ( utilfile "k8s.io/kubernetes/pkg/util/file" "k8s.io/kubernetes/pkg/util/goroutinemap/exponentialbackoff" "k8s.io/kubernetes/pkg/util/mount" - utilstrings "k8s.io/kubernetes/pkg/util/strings" volumepkg "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/util" "k8s.io/kubernetes/pkg/volume/util/nestedpendingoperations" "k8s.io/kubernetes/pkg/volume/util/operationexecutor" volumetypes "k8s.io/kubernetes/pkg/volume/util/types" + utilsstrings "k8s.io/utils/strings" ) // Reconciler runs a periodic loop to reconcile the desired state of the world @@ -678,7 +678,7 @@ func getVolumesFromPodDir(podDir string) ([]podVolume, error) { klog.Errorf("Could not read volume plugin directory %q: %v", volumePluginPath, err) continue } - unescapePluginName := utilstrings.UnescapeQualifiedNameForDisk(pluginName) + unescapePluginName := utilsstrings.UnescapeQualifiedName(pluginName) for _, volumeName := range volumePluginDirs { mountPath := path.Join(volumePluginPath, volumeName) klog.V(5).Infof("podName: %v, mount path from volume plugin directory: %v, ", podName, mountPath) diff --git a/pkg/volume/awsebs/BUILD b/pkg/volume/awsebs/BUILD index 27213a3b62..92bd082e7a 100644 --- a/pkg/volume/awsebs/BUILD +++ b/pkg/volume/awsebs/BUILD @@ -20,7 +20,6 @@ go_library( "//pkg/cloudprovider/providers/aws:go_default_library", "//pkg/features:go_default_library", "//pkg/util/mount:go_default_library", - "//pkg/util/strings:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/util:go_default_library", "//pkg/volume/util/volumepathhandler:go_default_library", @@ -32,6 +31,7 @@ go_library( "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", "//staging/src/k8s.io/cloud-provider:go_default_library", "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/utils/strings:go_default_library", ], ) diff --git a/pkg/volume/awsebs/aws_ebs.go b/pkg/volume/awsebs/aws_ebs.go index d94f63e0f8..ab922073a8 100644 --- a/pkg/volume/awsebs/aws_ebs.go +++ b/pkg/volume/awsebs/aws_ebs.go @@ -35,9 +35,9 @@ import ( "k8s.io/kubernetes/pkg/cloudprovider/providers/aws" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/util/mount" - kstrings "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/util" + utilsstrings "k8s.io/utils/strings" ) // ProbeVolumePlugins is the primary entrypoint for volume plugins. @@ -60,7 +60,7 @@ const ( ) func getPath(uid types.UID, volName string, host volume.VolumeHost) string { - return host.GetPodVolumeDir(uid, kstrings.EscapeQualifiedNameForDisk(awsElasticBlockStorePluginName), volName) + return host.GetPodVolumeDir(uid, utilsstrings.EscapeQualifiedName(awsElasticBlockStorePluginName), volName) } func (plugin *awsElasticBlockStorePlugin) Init(host volume.VolumeHost) error { diff --git a/pkg/volume/awsebs/aws_ebs_block.go b/pkg/volume/awsebs/aws_ebs_block.go index a6d64b5c49..d23e29756f 100644 --- a/pkg/volume/awsebs/aws_ebs_block.go +++ b/pkg/volume/awsebs/aws_ebs_block.go @@ -28,10 +28,10 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/kubernetes/pkg/cloudprovider/providers/aws" "k8s.io/kubernetes/pkg/util/mount" - kstrings "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/util" "k8s.io/kubernetes/pkg/volume/util/volumepathhandler" + utilsstrings "k8s.io/utils/strings" ) var _ volume.BlockVolumePlugin = &awsElasticBlockStorePlugin{} @@ -172,5 +172,5 @@ func (ebs *awsElasticBlockStore) GetGlobalMapPath(spec *volume.Spec) (string, er // path: pods/{podUid}/volumeDevices/kubernetes.io~aws func (ebs *awsElasticBlockStore) GetPodDeviceMapPath() (string, string) { name := awsElasticBlockStorePluginName - return ebs.plugin.host.GetPodVolumeDeviceDir(ebs.podUID, kstrings.EscapeQualifiedNameForDisk(name)), ebs.volName + return ebs.plugin.host.GetPodVolumeDeviceDir(ebs.podUID, utilsstrings.EscapeQualifiedName(name)), ebs.volName } diff --git a/pkg/volume/azure_dd/BUILD b/pkg/volume/azure_dd/BUILD index 3fe9b993bd..74dd5b980a 100644 --- a/pkg/volume/azure_dd/BUILD +++ b/pkg/volume/azure_dd/BUILD @@ -26,7 +26,6 @@ go_library( "//pkg/features:go_default_library", "//pkg/kubelet/apis:go_default_library", "//pkg/util/mount:go_default_library", - "//pkg/util/strings:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/util:go_default_library", "//pkg/volume/util/volumepathhandler:go_default_library", @@ -42,6 +41,7 @@ go_library( "//vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2018-07-01/storage:go_default_library", "//vendor/k8s.io/klog:go_default_library", "//vendor/k8s.io/utils/keymutex:go_default_library", + "//vendor/k8s.io/utils/strings:go_default_library", ], ) diff --git a/pkg/volume/azure_dd/azure_common.go b/pkg/volume/azure_dd/azure_common.go index 174510c5d1..451b4048cb 100644 --- a/pkg/volume/azure_dd/azure_common.go +++ b/pkg/volume/azure_dd/azure_common.go @@ -33,8 +33,8 @@ import ( api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/cloudprovider/providers/azure" "k8s.io/kubernetes/pkg/util/mount" - "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" + "k8s.io/utils/strings" ) const ( @@ -66,7 +66,7 @@ var ( ) func getPath(uid types.UID, volName string, host volume.VolumeHost) string { - return host.GetPodVolumeDir(uid, strings.EscapeQualifiedNameForDisk(azureDataDiskPluginName), volName) + return host.GetPodVolumeDir(uid, strings.EscapeQualifiedName(azureDataDiskPluginName), volName) } // creates a unique path for disks (even if they share the same *.vhd name) diff --git a/pkg/volume/azure_dd/azure_dd_block.go b/pkg/volume/azure_dd/azure_dd_block.go index 7043049946..c5b6adbde9 100644 --- a/pkg/volume/azure_dd/azure_dd_block.go +++ b/pkg/volume/azure_dd/azure_dd_block.go @@ -25,10 +25,10 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/klog" "k8s.io/kubernetes/pkg/util/mount" - kstrings "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/util" "k8s.io/kubernetes/pkg/volume/util/volumepathhandler" + utilsstrings "k8s.io/utils/strings" ) var _ volume.VolumePlugin = &azureDataDiskPlugin{} @@ -157,5 +157,5 @@ func (disk *dataDisk) GetGlobalMapPath(spec *volume.Spec) (string, error) { // path: pods/{podUid}/volumeDevices/kubernetes.io~azure func (disk *dataDisk) GetPodDeviceMapPath() (string, string) { name := azureDataDiskPluginName - return disk.plugin.host.GetPodVolumeDeviceDir(disk.podUID, kstrings.EscapeQualifiedNameForDisk(name)), disk.volumeName + return disk.plugin.host.GetPodVolumeDeviceDir(disk.podUID, utilsstrings.EscapeQualifiedName(name)), disk.volumeName } diff --git a/pkg/volume/azure_file/BUILD b/pkg/volume/azure_file/BUILD index b4fa68effe..bfa63a9b61 100644 --- a/pkg/volume/azure_file/BUILD +++ b/pkg/volume/azure_file/BUILD @@ -18,7 +18,6 @@ go_library( deps = [ "//pkg/cloudprovider/providers/azure:go_default_library", "//pkg/util/mount:go_default_library", - "//pkg/util/strings:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/util:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -29,6 +28,7 @@ go_library( "//staging/src/k8s.io/cloud-provider:go_default_library", "//vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2018-07-01/storage:go_default_library", "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/utils/strings:go_default_library", ], ) diff --git a/pkg/volume/azure_file/azure_file.go b/pkg/volume/azure_file/azure_file.go index 97b29bc1a8..07b25e81e6 100644 --- a/pkg/volume/azure_file/azure_file.go +++ b/pkg/volume/azure_file/azure_file.go @@ -30,9 +30,9 @@ import ( "k8s.io/klog" "k8s.io/kubernetes/pkg/cloudprovider/providers/azure" "k8s.io/kubernetes/pkg/util/mount" - kstrings "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" volutil "k8s.io/kubernetes/pkg/volume/util" + utilsstrings "k8s.io/utils/strings" ) // ProbeVolumePlugins is the primary endpoint for volume plugins @@ -53,7 +53,7 @@ const ( ) func getPath(uid types.UID, volName string, host volume.VolumeHost) string { - return host.GetPodVolumeDir(uid, kstrings.EscapeQualifiedNameForDisk(azureFilePluginName), volName) + return host.GetPodVolumeDir(uid, utilsstrings.EscapeQualifiedName(azureFilePluginName), volName) } func (plugin *azureFilePlugin) Init(host volume.VolumeHost) error { diff --git a/pkg/volume/azure_file/azure_provision.go b/pkg/volume/azure_file/azure_provision.go index 60466cedab..06637ee248 100644 --- a/pkg/volume/azure_file/azure_provision.go +++ b/pkg/volume/azure_file/azure_provision.go @@ -28,9 +28,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" cloudprovider "k8s.io/cloud-provider" "k8s.io/kubernetes/pkg/cloudprovider/providers/azure" - utilstrings "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/util" + utilsstrings "k8s.io/utils/strings" ) var _ volume.DeletableVolumePlugin = &azureFilePlugin{} @@ -116,7 +116,7 @@ var _ volume.Deleter = &azureFileDeleter{} func (f *azureFileDeleter) GetPath() string { name := azureFilePluginName - return f.plugin.host.GetPodVolumeDir(f.podUID, utilstrings.EscapeQualifiedNameForDisk(name), f.volName) + return f.plugin.host.GetPodVolumeDir(f.podUID, utilsstrings.EscapeQualifiedName(name), f.volName) } func (f *azureFileDeleter) Delete() error { diff --git a/pkg/volume/cephfs/BUILD b/pkg/volume/cephfs/BUILD index eeb4ee0dce..993481194d 100644 --- a/pkg/volume/cephfs/BUILD +++ b/pkg/volume/cephfs/BUILD @@ -15,13 +15,13 @@ go_library( importpath = "k8s.io/kubernetes/pkg/volume/cephfs", deps = [ "//pkg/util/mount:go_default_library", - "//pkg/util/strings:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/util:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/utils/strings:go_default_library", ], ) diff --git a/pkg/volume/cephfs/cephfs.go b/pkg/volume/cephfs/cephfs.go index ec571c6d90..0f7e9e6a15 100644 --- a/pkg/volume/cephfs/cephfs.go +++ b/pkg/volume/cephfs/cephfs.go @@ -29,9 +29,9 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/klog" "k8s.io/kubernetes/pkg/util/mount" - utilstrings "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/util" + utilsstrings "k8s.io/utils/strings" ) // ProbeVolumePlugins is the primary entrypoint for volume plugins. @@ -289,13 +289,13 @@ func (cephfsVolume *cephfsUnmounter) TearDownAt(dir string) error { // GetPath creates global mount path func (cephfsVolume *cephfs) GetPath() string { name := cephfsPluginName - return cephfsVolume.plugin.host.GetPodVolumeDir(cephfsVolume.podUID, utilstrings.EscapeQualifiedNameForDisk(name), cephfsVolume.volName) + return cephfsVolume.plugin.host.GetPodVolumeDir(cephfsVolume.podUID, utilsstrings.EscapeQualifiedName(name), cephfsVolume.volName) } // GetKeyringPath creates cephfuse keyring path func (cephfsVolume *cephfs) GetKeyringPath() string { name := cephfsPluginName - volumeDir := cephfsVolume.plugin.host.GetPodVolumeDir(cephfsVolume.podUID, utilstrings.EscapeQualifiedNameForDisk(name), cephfsVolume.volName) + volumeDir := cephfsVolume.plugin.host.GetPodVolumeDir(cephfsVolume.podUID, utilsstrings.EscapeQualifiedName(name), cephfsVolume.volName) volumeKeyringDir := volumeDir + "~keyring" return volumeKeyringDir } diff --git a/pkg/volume/cinder/BUILD b/pkg/volume/cinder/BUILD index f04049f859..8b99eb6451 100644 --- a/pkg/volume/cinder/BUILD +++ b/pkg/volume/cinder/BUILD @@ -21,7 +21,6 @@ go_library( "//pkg/features:go_default_library", "//pkg/kubelet/apis:go_default_library", "//pkg/util/mount:go_default_library", - "//pkg/util/strings:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/util:go_default_library", "//pkg/volume/util/volumepathhandler:go_default_library", @@ -37,6 +36,7 @@ go_library( "//vendor/k8s.io/klog:go_default_library", "//vendor/k8s.io/utils/exec:go_default_library", "//vendor/k8s.io/utils/keymutex:go_default_library", + "//vendor/k8s.io/utils/strings:go_default_library", ], ) diff --git a/pkg/volume/cinder/cinder.go b/pkg/volume/cinder/cinder.go index a609f0f43c..81f1934900 100644 --- a/pkg/volume/cinder/cinder.go +++ b/pkg/volume/cinder/cinder.go @@ -32,10 +32,10 @@ import ( "k8s.io/kubernetes/pkg/cloudprovider/providers/openstack" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/util/mount" - kstrings "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/util" "k8s.io/utils/keymutex" + utilsstrings "k8s.io/utils/strings" ) const ( @@ -82,7 +82,7 @@ const ( ) func getPath(uid types.UID, volName string, host volume.VolumeHost) string { - return host.GetPodVolumeDir(uid, kstrings.EscapeQualifiedNameForDisk(cinderVolumePluginName), volName) + return host.GetPodVolumeDir(uid, utilsstrings.EscapeQualifiedName(cinderVolumePluginName), volName) } func (plugin *cinderPlugin) Init(host volume.VolumeHost) error { diff --git a/pkg/volume/cinder/cinder_block.go b/pkg/volume/cinder/cinder_block.go index 90e2056e04..4e35530707 100644 --- a/pkg/volume/cinder/cinder_block.go +++ b/pkg/volume/cinder/cinder_block.go @@ -24,10 +24,10 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/klog" "k8s.io/kubernetes/pkg/util/mount" - kstrings "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/util" "k8s.io/kubernetes/pkg/volume/util/volumepathhandler" + utilsstrings "k8s.io/utils/strings" ) var _ volume.VolumePlugin = &cinderPlugin{} @@ -163,5 +163,5 @@ func (cd *cinderVolume) GetGlobalMapPath(spec *volume.Spec) (string, error) { // path: pods/{podUid}/volumeDevices/kubernetes.io~cinder func (cd *cinderVolume) GetPodDeviceMapPath() (string, string) { name := cinderVolumePluginName - return cd.plugin.host.GetPodVolumeDeviceDir(cd.podUID, kstrings.EscapeQualifiedNameForDisk(name)), cd.volName + return cd.plugin.host.GetPodVolumeDeviceDir(cd.podUID, utilsstrings.EscapeQualifiedName(name)), cd.volName } diff --git a/pkg/volume/configmap/BUILD b/pkg/volume/configmap/BUILD index 1047a1b090..a8329fa8b0 100644 --- a/pkg/volume/configmap/BUILD +++ b/pkg/volume/configmap/BUILD @@ -15,7 +15,6 @@ go_library( importpath = "k8s.io/kubernetes/pkg/volume/configmap", deps = [ "//pkg/util/mount:go_default_library", - "//pkg/util/strings:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/util:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -23,6 +22,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/utils/strings:go_default_library", ], ) diff --git a/pkg/volume/configmap/configmap.go b/pkg/volume/configmap/configmap.go index 5711b95924..610f7870e3 100644 --- a/pkg/volume/configmap/configmap.go +++ b/pkg/volume/configmap/configmap.go @@ -25,9 +25,9 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/klog" "k8s.io/kubernetes/pkg/util/mount" - "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" volumeutil "k8s.io/kubernetes/pkg/volume/util" + "k8s.io/utils/strings" ) // ProbeVolumePlugins is the entry point for plugin detection in a package. @@ -48,7 +48,7 @@ type configMapPlugin struct { var _ volume.VolumePlugin = &configMapPlugin{} func getPath(uid types.UID, volName string, host volume.VolumeHost) string { - return host.GetPodVolumeDir(uid, strings.EscapeQualifiedNameForDisk(configMapPluginName), volName) + return host.GetPodVolumeDir(uid, strings.EscapeQualifiedName(configMapPluginName), volName) } func (plugin *configMapPlugin) Init(host volume.VolumeHost) error { @@ -142,7 +142,7 @@ type configMapVolume struct { var _ volume.Volume = &configMapVolume{} func (sv *configMapVolume) GetPath() string { - return sv.plugin.host.GetPodVolumeDir(sv.podUID, strings.EscapeQualifiedNameForDisk(configMapPluginName), sv.volName) + return sv.plugin.host.GetPodVolumeDir(sv.podUID, strings.EscapeQualifiedName(configMapPluginName), sv.volName) } // configMapVolumeMounter handles retrieving secrets from the API server diff --git a/pkg/volume/csi/BUILD b/pkg/volume/csi/BUILD index a4ac6145d4..d2e218ef38 100644 --- a/pkg/volume/csi/BUILD +++ b/pkg/volume/csi/BUILD @@ -14,7 +14,6 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/features:go_default_library", - "//pkg/util/strings:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/csi/csiv0:go_default_library", "//pkg/volume/csi/nodeinfomanager:go_default_library", @@ -35,6 +34,7 @@ go_library( "//vendor/github.com/container-storage-interface/spec/lib/go/csi:go_default_library", "//vendor/google.golang.org/grpc:go_default_library", "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/utils/strings:go_default_library", ], ) diff --git a/pkg/volume/csi/csi_block.go b/pkg/volume/csi/csi_block.go index 3a80352c58..6e5024c9ed 100644 --- a/pkg/volume/csi/csi_block.go +++ b/pkg/volume/csi/csi_block.go @@ -31,9 +31,9 @@ import ( meta "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/kubernetes" - kstrings "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" ioutil "k8s.io/kubernetes/pkg/volume/util" + utilsstrings "k8s.io/utils/strings" ) type csiBlockMapper struct { @@ -62,21 +62,21 @@ func (m *csiBlockMapper) GetGlobalMapPath(spec *volume.Spec) (string, error) { // getStagingPath returns a staging path for a directory (on the node) that should be used on NodeStageVolume/NodeUnstageVolume // Example: plugins/kubernetes.io/csi/volumeDevices/staging/{pvname} func (m *csiBlockMapper) getStagingPath() string { - sanitizedSpecVolID := kstrings.EscapeQualifiedNameForDisk(m.specName) + sanitizedSpecVolID := utilsstrings.EscapeQualifiedName(m.specName) return path.Join(m.plugin.host.GetVolumeDevicePluginDir(csiPluginName), "staging", sanitizedSpecVolID) } // getPublishPath returns a publish path for a file (on the node) that should be used on NodePublishVolume/NodeUnpublishVolume // Example: plugins/kubernetes.io/csi/volumeDevices/publish/{pvname} func (m *csiBlockMapper) getPublishPath() string { - sanitizedSpecVolID := kstrings.EscapeQualifiedNameForDisk(m.specName) + sanitizedSpecVolID := utilsstrings.EscapeQualifiedName(m.specName) return path.Join(m.plugin.host.GetVolumeDevicePluginDir(csiPluginName), "publish", sanitizedSpecVolID) } // GetPodDeviceMapPath returns pod's device file which will be mapped to a volume // returns: pods/{podUid}/volumeDevices/kubernetes.io~csi, {pvname} func (m *csiBlockMapper) GetPodDeviceMapPath() (string, string) { - path := m.plugin.host.GetPodVolumeDeviceDir(m.podUID, kstrings.EscapeQualifiedNameForDisk(csiPluginName)) + path := m.plugin.host.GetPodVolumeDeviceDir(m.podUID, utilsstrings.EscapeQualifiedName(csiPluginName)) specName := m.specName klog.V(4).Infof(log("blockMapper.GetPodDeviceMapPath [path=%s; name=%s]", path, specName)) return path, specName diff --git a/pkg/volume/csi/csi_mounter.go b/pkg/volume/csi/csi_mounter.go index b46c89f1ef..3f40830307 100644 --- a/pkg/volume/csi/csi_mounter.go +++ b/pkg/volume/csi/csi_mounter.go @@ -31,8 +31,8 @@ import ( utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/client-go/kubernetes" "k8s.io/kubernetes/pkg/features" - kstrings "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" + utilsstrings "k8s.io/utils/strings" ) //TODO (vladimirvivien) move this in a central loc later @@ -79,8 +79,8 @@ func (c *csiMountMgr) GetPath() string { } func getTargetPath(uid types.UID, specVolumeID string, host volume.VolumeHost) string { - specVolID := kstrings.EscapeQualifiedNameForDisk(specVolumeID) - return host.GetPodVolumeDir(uid, kstrings.EscapeQualifiedNameForDisk(csiPluginName), specVolID) + specVolID := utilsstrings.EscapeQualifiedName(specVolumeID) + return host.GetPodVolumeDir(uid, utilsstrings.EscapeQualifiedName(csiPluginName), specVolID) } // volume.Mounter methods diff --git a/pkg/volume/csi/csi_util.go b/pkg/volume/csi/csi_util.go index 3fe103584c..85aafeec5b 100644 --- a/pkg/volume/csi/csi_util.go +++ b/pkg/volume/csi/csi_util.go @@ -22,13 +22,14 @@ import ( "os" "path" + "time" + api "k8s.io/api/core/v1" meta "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" "k8s.io/klog" - kstrings "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" - "time" + utilsstrings "k8s.io/utils/strings" ) const ( @@ -116,7 +117,7 @@ func log(msg string, parts ...interface{}) string { // symlink for a block device associated with a given specVolumeID. // path: plugins/kubernetes.io/csi/volumeDevices/{specVolumeID}/dev func getVolumeDevicePluginDir(specVolID string, host volume.VolumeHost) string { - sanitizedSpecVolID := kstrings.EscapeQualifiedNameForDisk(specVolID) + sanitizedSpecVolID := utilsstrings.EscapeQualifiedName(specVolID) return path.Join(host.GetVolumeDevicePluginDir(csiPluginName), sanitizedSpecVolID, "dev") } @@ -124,7 +125,7 @@ func getVolumeDevicePluginDir(specVolID string, host volume.VolumeHost) string { // volume data for a block device associated with a given specVolumeID. // path: plugins/kubernetes.io/csi/volumeDevices/{specVolumeID}/data func getVolumeDeviceDataDir(specVolID string, host volume.VolumeHost) string { - sanitizedSpecVolID := kstrings.EscapeQualifiedNameForDisk(specVolID) + sanitizedSpecVolID := utilsstrings.EscapeQualifiedName(specVolID) return path.Join(host.GetVolumeDevicePluginDir(csiPluginName), sanitizedSpecVolID, "data") } diff --git a/pkg/volume/downwardapi/BUILD b/pkg/volume/downwardapi/BUILD index d223844116..cece3c521e 100644 --- a/pkg/volume/downwardapi/BUILD +++ b/pkg/volume/downwardapi/BUILD @@ -13,13 +13,13 @@ go_library( deps = [ "//pkg/api/v1/resource:go_default_library", "//pkg/fieldpath:go_default_library", - "//pkg/util/strings:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/util:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/errors:go_default_library", "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/utils/strings:go_default_library", ], ) diff --git a/pkg/volume/downwardapi/downwardapi.go b/pkg/volume/downwardapi/downwardapi.go index d6239fdf04..49700b7e48 100644 --- a/pkg/volume/downwardapi/downwardapi.go +++ b/pkg/volume/downwardapi/downwardapi.go @@ -23,13 +23,12 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" utilerrors "k8s.io/apimachinery/pkg/util/errors" + "k8s.io/klog" "k8s.io/kubernetes/pkg/api/v1/resource" "k8s.io/kubernetes/pkg/fieldpath" - utilstrings "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" volumeutil "k8s.io/kubernetes/pkg/volume/util" - - "k8s.io/klog" + utilsstrings "k8s.io/utils/strings" ) // ProbeVolumePlugins is the entry point for plugin detection in a package. @@ -49,7 +48,7 @@ type downwardAPIPlugin struct { var _ volume.VolumePlugin = &downwardAPIPlugin{} func getPath(uid types.UID, volName string, host volume.VolumeHost) string { - return host.GetPodVolumeDir(uid, utilstrings.EscapeQualifiedNameForDisk(downwardAPIPluginName), volName) + return host.GetPodVolumeDir(uid, utilsstrings.EscapeQualifiedName(downwardAPIPluginName), volName) } func wrappedVolumeSpec() volume.Spec { @@ -289,7 +288,7 @@ func CollectData(items []v1.DownwardAPIVolumeFile, pod *v1.Pod, host volume.Volu } func (d *downwardAPIVolume) GetPath() string { - return d.plugin.host.GetPodVolumeDir(d.podUID, utilstrings.EscapeQualifiedNameForDisk(downwardAPIPluginName), d.volName) + return d.plugin.host.GetPodVolumeDir(d.podUID, utilsstrings.EscapeQualifiedName(downwardAPIPluginName), d.volName) } // downwardAPIVolumeCleaner handles cleaning up downwardAPI volumes diff --git a/pkg/volume/emptydir/BUILD b/pkg/volume/emptydir/BUILD index fd4eaff033..08c2bc334f 100644 --- a/pkg/volume/emptydir/BUILD +++ b/pkg/volume/emptydir/BUILD @@ -18,7 +18,6 @@ go_library( deps = [ "//pkg/apis/core/v1/helper:go_default_library", "//pkg/util/mount:go_default_library", - "//pkg/util/strings:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/util:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -26,6 +25,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/utils/strings:go_default_library", ] + select({ "@io_bazel_rules_go//go/platform:linux": [ "//vendor/golang.org/x/sys/unix:go_default_library", diff --git a/pkg/volume/emptydir/empty_dir.go b/pkg/volume/emptydir/empty_dir.go index b3474bbe5d..2fae1a9c78 100644 --- a/pkg/volume/emptydir/empty_dir.go +++ b/pkg/volume/emptydir/empty_dir.go @@ -28,9 +28,9 @@ import ( "k8s.io/klog" v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" "k8s.io/kubernetes/pkg/util/mount" - stringsutil "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" volumeutil "k8s.io/kubernetes/pkg/volume/util" + utilsstrings "k8s.io/utils/strings" ) // TODO: in the near future, this will be changed to be more restrictive @@ -59,7 +59,7 @@ const ( ) func getPath(uid types.UID, volName string, host volume.VolumeHost) string { - return host.GetPodVolumeDir(uid, stringsutil.EscapeQualifiedNameForDisk(emptyDirPluginName), volName) + return host.GetPodVolumeDir(uid, utilsstrings.EscapeQualifiedName(emptyDirPluginName), volName) } func (plugin *emptyDirPlugin) Init(host volume.VolumeHost) error { @@ -420,7 +420,7 @@ func (ed *emptyDir) teardownTmpfsOrHugetlbfs(dir string) error { } func (ed *emptyDir) getMetaDir() string { - return path.Join(ed.plugin.host.GetPodPluginDir(ed.pod.UID, stringsutil.EscapeQualifiedNameForDisk(emptyDirPluginName)), ed.volName) + return path.Join(ed.plugin.host.GetPodPluginDir(ed.pod.UID, utilsstrings.EscapeQualifiedName(emptyDirPluginName)), ed.volName) } func getVolumeSource(spec *volume.Spec) (*v1.EmptyDirVolumeSource, bool) { diff --git a/pkg/volume/fc/BUILD b/pkg/volume/fc/BUILD index 8c7328601d..bec107d7dc 100644 --- a/pkg/volume/fc/BUILD +++ b/pkg/volume/fc/BUILD @@ -19,7 +19,6 @@ go_library( deps = [ "//pkg/features:go_default_library", "//pkg/util/mount:go_default_library", - "//pkg/util/strings:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/util:go_default_library", "//pkg/volume/util/volumepathhandler:go_default_library", @@ -28,6 +27,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/utils/strings:go_default_library", ], ) diff --git a/pkg/volume/fc/fc.go b/pkg/volume/fc/fc.go index 5997a9756c..e78d2c9d6f 100644 --- a/pkg/volume/fc/fc.go +++ b/pkg/volume/fc/fc.go @@ -29,10 +29,10 @@ import ( "k8s.io/klog" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/util/mount" - utilstrings "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/util" "k8s.io/kubernetes/pkg/volume/util/volumepathhandler" + utilsstrings "k8s.io/utils/strings" ) // ProbeVolumePlugins is the primary entrypoint for volume plugins. @@ -360,7 +360,7 @@ type fcDisk struct { func (fc *fcDisk) GetPath() string { // safe to use PodVolumeDir now: volume teardown occurs before pod is cleaned up - return fc.plugin.host.GetPodVolumeDir(fc.podUID, utilstrings.EscapeQualifiedNameForDisk(fcPluginName), fc.volName) + return fc.plugin.host.GetPodVolumeDir(fc.podUID, utilsstrings.EscapeQualifiedName(fcPluginName), fc.volName) } func (fc *fcDisk) fcGlobalMapPath(spec *volume.Spec) (string, error) { @@ -373,7 +373,7 @@ func (fc *fcDisk) fcGlobalMapPath(spec *volume.Spec) (string, error) { } func (fc *fcDisk) fcPodDeviceMapPath() (string, string) { - return fc.plugin.host.GetPodVolumeDeviceDir(fc.podUID, utilstrings.EscapeQualifiedNameForDisk(fcPluginName)), fc.volName + return fc.plugin.host.GetPodVolumeDeviceDir(fc.podUID, utilsstrings.EscapeQualifiedName(fcPluginName)), fc.volName } type fcDiskMounter struct { diff --git a/pkg/volume/flexvolume/BUILD b/pkg/volume/flexvolume/BUILD index f337fc42bb..6af91d5924 100644 --- a/pkg/volume/flexvolume/BUILD +++ b/pkg/volume/flexvolume/BUILD @@ -31,7 +31,6 @@ go_library( deps = [ "//pkg/util/filesystem:go_default_library", "//pkg/util/mount:go_default_library", - "//pkg/util/strings:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/util:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -41,6 +40,7 @@ go_library( "//vendor/github.com/fsnotify/fsnotify:go_default_library", "//vendor/k8s.io/klog:go_default_library", "//vendor/k8s.io/utils/exec:go_default_library", + "//vendor/k8s.io/utils/strings:go_default_library", ], ) diff --git a/pkg/volume/flexvolume/plugin.go b/pkg/volume/flexvolume/plugin.go index 4721d78bd3..f0afd834eb 100644 --- a/pkg/volume/flexvolume/plugin.go +++ b/pkg/volume/flexvolume/plugin.go @@ -23,15 +23,14 @@ import ( "strings" "sync" - "k8s.io/klog" - api "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" + "k8s.io/klog" "k8s.io/kubernetes/pkg/util/mount" - utilstrings "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/util" "k8s.io/utils/exec" + utilsstrings "k8s.io/utils/strings" ) const ( @@ -72,7 +71,7 @@ type pluginFactory struct{} func (pluginFactory) NewFlexVolumePlugin(pluginDir, name string, runner exec.Interface) (volume.VolumePlugin, error) { execPath := path.Join(pluginDir, name) - driverName := utilstrings.UnescapePluginName(name) + driverName := utilsstrings.UnescapeQualifiedName(name) flexPlugin := &flexVolumePlugin{ driverName: driverName, @@ -186,7 +185,7 @@ func (plugin *flexVolumePlugin) newMounterInternal(spec *volume.Spec, pod *api.P var metricsProvider volume.MetricsProvider if plugin.capabilities.SupportsMetrics { metricsProvider = volume.NewMetricsStatFS(plugin.host.GetPodVolumeDir( - pod.UID, utilstrings.EscapeQualifiedNameForDisk(sourceDriver), spec.Name())) + pod.UID, utilsstrings.EscapeQualifiedName(sourceDriver), spec.Name())) } else { metricsProvider = &volume.MetricsNil{} } @@ -220,7 +219,7 @@ func (plugin *flexVolumePlugin) newUnmounterInternal(volName string, podUID type var metricsProvider volume.MetricsProvider if plugin.capabilities.SupportsMetrics { metricsProvider = volume.NewMetricsStatFS(plugin.host.GetPodVolumeDir( - podUID, utilstrings.EscapeQualifiedNameForDisk(plugin.driverName), volName)) + podUID, utilsstrings.EscapeQualifiedName(plugin.driverName), volName)) } else { metricsProvider = &volume.MetricsNil{} } diff --git a/pkg/volume/flexvolume/probe.go b/pkg/volume/flexvolume/probe.go index 7a929e5ce9..bc6e3b30cb 100644 --- a/pkg/volume/flexvolume/probe.go +++ b/pkg/volume/flexvolume/probe.go @@ -17,22 +17,19 @@ limitations under the License. package flexvolume import ( - "k8s.io/klog" - "k8s.io/kubernetes/pkg/volume" - "k8s.io/utils/exec" - - "os" - "fmt" + "os" "path/filepath" - "sync" - "strings" + "sync" "github.com/fsnotify/fsnotify" "k8s.io/apimachinery/pkg/util/errors" + "k8s.io/klog" utilfs "k8s.io/kubernetes/pkg/util/filesystem" - utilstrings "k8s.io/kubernetes/pkg/util/strings" + "k8s.io/kubernetes/pkg/volume" + "k8s.io/utils/exec" + utilsstrings "k8s.io/utils/strings" ) type flexVolumeProber struct { @@ -142,7 +139,7 @@ func (prober *flexVolumeProber) newProbeEvent(driverDirName string, op volume.Pr probeEvent.Plugin = plugin probeEvent.PluginName = plugin.GetPluginName() } else if op == volume.ProbeRemove { - driverName := utilstrings.UnescapePluginName(driverDirName) + driverName := utilsstrings.UnescapeQualifiedName(driverDirName) probeEvent.PluginName = flexVolumePluginNamePrefix + driverName } else { diff --git a/pkg/volume/flexvolume/volume.go b/pkg/volume/flexvolume/volume.go index f4988d839e..d9922d6440 100644 --- a/pkg/volume/flexvolume/volume.go +++ b/pkg/volume/flexvolume/volume.go @@ -19,8 +19,8 @@ package flexvolume import ( "k8s.io/apimachinery/pkg/types" "k8s.io/kubernetes/pkg/util/mount" - utilstrings "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" + utilsstrings "k8s.io/utils/strings" ) type flexVolume struct { @@ -51,5 +51,5 @@ type flexVolume struct { func (f *flexVolume) GetPath() string { name := f.driverName - return f.plugin.host.GetPodVolumeDir(f.podUID, utilstrings.EscapeQualifiedNameForDisk(name), f.volName) + return f.plugin.host.GetPodVolumeDir(f.podUID, utilsstrings.EscapeQualifiedName(name), f.volName) } diff --git a/pkg/volume/flocker/BUILD b/pkg/volume/flocker/BUILD index 0067622c19..d58059aa58 100644 --- a/pkg/volume/flocker/BUILD +++ b/pkg/volume/flocker/BUILD @@ -18,7 +18,6 @@ go_library( deps = [ "//pkg/util/env:go_default_library", "//pkg/util/mount:go_default_library", - "//pkg/util/strings:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/util:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -28,6 +27,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/util/rand:go_default_library", "//vendor/github.com/clusterhq/flocker-go:go_default_library", "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/utils/strings:go_default_library", ], ) diff --git a/pkg/volume/flocker/flocker.go b/pkg/volume/flocker/flocker.go index e9c1623aee..02a81f7f53 100644 --- a/pkg/volume/flocker/flocker.go +++ b/pkg/volume/flocker/flocker.go @@ -27,8 +27,8 @@ import ( "k8s.io/klog" "k8s.io/kubernetes/pkg/util/env" "k8s.io/kubernetes/pkg/util/mount" - "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" + "k8s.io/utils/strings" flockerapi "github.com/clusterhq/flocker-go" ) @@ -77,7 +77,7 @@ const ( ) func getPath(uid types.UID, volName string, host volume.VolumeHost) string { - return host.GetPodVolumeDir(uid, strings.EscapeQualifiedNameForDisk(flockerPluginName), volName) + return host.GetPodVolumeDir(uid, strings.EscapeQualifiedName(flockerPluginName), volName) } func makeGlobalFlockerPath(datasetUUID string) string { diff --git a/pkg/volume/gcepd/BUILD b/pkg/volume/gcepd/BUILD index 938b575733..ed00e269c0 100644 --- a/pkg/volume/gcepd/BUILD +++ b/pkg/volume/gcepd/BUILD @@ -22,7 +22,6 @@ go_library( "//pkg/kubelet/apis:go_default_library", "//pkg/util/file:go_default_library", "//pkg/util/mount:go_default_library", - "//pkg/util/strings:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/util:go_default_library", "//pkg/volume/util/volumepathhandler:go_default_library", @@ -35,6 +34,7 @@ go_library( "//staging/src/k8s.io/cloud-provider:go_default_library", "//vendor/k8s.io/klog:go_default_library", "//vendor/k8s.io/utils/exec:go_default_library", + "//vendor/k8s.io/utils/strings:go_default_library", ], ) diff --git a/pkg/volume/gcepd/gce_pd.go b/pkg/volume/gcepd/gce_pd.go index c4f3c4551e..0c2a5cb4c6 100644 --- a/pkg/volume/gcepd/gce_pd.go +++ b/pkg/volume/gcepd/gce_pd.go @@ -34,9 +34,9 @@ import ( "k8s.io/kubernetes/pkg/features" kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" "k8s.io/kubernetes/pkg/util/mount" - kstrings "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/util" + utilsstrings "k8s.io/utils/strings" ) // ProbeVolumePlugins is the primary entrypoint for volume plugins. @@ -72,7 +72,7 @@ const ( ) func getPath(uid types.UID, volName string, host volume.VolumeHost) string { - return host.GetPodVolumeDir(uid, kstrings.EscapeQualifiedNameForDisk(gcePersistentDiskPluginName), volName) + return host.GetPodVolumeDir(uid, utilsstrings.EscapeQualifiedName(gcePersistentDiskPluginName), volName) } func (plugin *gcePersistentDiskPlugin) Init(host volume.VolumeHost) error { diff --git a/pkg/volume/gcepd/gce_pd_block.go b/pkg/volume/gcepd/gce_pd_block.go index f4e7e2c725..d72a41cd54 100644 --- a/pkg/volume/gcepd/gce_pd_block.go +++ b/pkg/volume/gcepd/gce_pd_block.go @@ -26,10 +26,10 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/klog" "k8s.io/kubernetes/pkg/util/mount" - kstrings "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/util" "k8s.io/kubernetes/pkg/volume/util/volumepathhandler" + utilsstrings "k8s.io/utils/strings" ) var _ volume.VolumePlugin = &gcePersistentDiskPlugin{} @@ -170,5 +170,5 @@ func (pd *gcePersistentDisk) GetGlobalMapPath(spec *volume.Spec) (string, error) // path: pods/{podUid}/volumeDevices/kubernetes.io~aws func (pd *gcePersistentDisk) GetPodDeviceMapPath() (string, string) { name := gcePersistentDiskPluginName - return pd.plugin.host.GetPodVolumeDeviceDir(pd.podUID, kstrings.EscapeQualifiedNameForDisk(name)), pd.volName + return pd.plugin.host.GetPodVolumeDeviceDir(pd.podUID, utilsstrings.EscapeQualifiedName(name)), pd.volName } diff --git a/pkg/volume/git_repo/BUILD b/pkg/volume/git_repo/BUILD index 48cfa4308d..57a9e29bdf 100644 --- a/pkg/volume/git_repo/BUILD +++ b/pkg/volume/git_repo/BUILD @@ -14,12 +14,12 @@ go_library( ], importpath = "k8s.io/kubernetes/pkg/volume/git_repo", deps = [ - "//pkg/util/strings:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/util:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", "//vendor/k8s.io/utils/exec:go_default_library", + "//vendor/k8s.io/utils/strings:go_default_library", ], ) diff --git a/pkg/volume/git_repo/git_repo.go b/pkg/volume/git_repo/git_repo.go index bba6c719e0..24c71bacec 100644 --- a/pkg/volume/git_repo/git_repo.go +++ b/pkg/volume/git_repo/git_repo.go @@ -25,10 +25,10 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" - utilstrings "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" volumeutil "k8s.io/kubernetes/pkg/volume/util" "k8s.io/utils/exec" + utilsstrings "k8s.io/utils/strings" ) // This is the primary entrypoint for volume plugins. @@ -147,7 +147,7 @@ var _ volume.Volume = &gitRepoVolume{} func (gr *gitRepoVolume) GetPath() string { name := gitRepoPluginName - return gr.plugin.host.GetPodVolumeDir(gr.podUID, utilstrings.EscapeQualifiedNameForDisk(name), gr.volName) + return gr.plugin.host.GetPodVolumeDir(gr.podUID, utilsstrings.EscapeQualifiedName(name), gr.volName) } // gitRepoVolumeMounter builds git repo volumes. @@ -248,7 +248,7 @@ func (b *gitRepoVolumeMounter) SetUpAt(dir string, fsGroup *int64) error { } func (b *gitRepoVolumeMounter) getMetaDir() string { - return path.Join(b.plugin.host.GetPodPluginDir(b.podUID, utilstrings.EscapeQualifiedNameForDisk(gitRepoPluginName)), b.volName) + return path.Join(b.plugin.host.GetPodPluginDir(b.podUID, utilsstrings.EscapeQualifiedName(gitRepoPluginName)), b.volName) } func (b *gitRepoVolumeMounter) execCommand(command string, args []string, dir string) ([]byte, error) { diff --git a/pkg/volume/glusterfs/BUILD b/pkg/volume/glusterfs/BUILD index 52e3300341..bc684f3284 100644 --- a/pkg/volume/glusterfs/BUILD +++ b/pkg/volume/glusterfs/BUILD @@ -18,7 +18,6 @@ go_library( deps = [ "//pkg/apis/core/v1/helper:go_default_library", "//pkg/util/mount:go_default_library", - "//pkg/util/strings:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/util:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -33,6 +32,7 @@ go_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:go_default_library", + "//vendor/k8s.io/utils/strings:go_default_library", ], ) diff --git a/pkg/volume/glusterfs/glusterfs.go b/pkg/volume/glusterfs/glusterfs.go index cf04da68e8..b15497602d 100644 --- a/pkg/volume/glusterfs/glusterfs.go +++ b/pkg/volume/glusterfs/glusterfs.go @@ -40,9 +40,9 @@ import ( "k8s.io/klog" v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" "k8s.io/kubernetes/pkg/util/mount" - "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" volutil "k8s.io/kubernetes/pkg/volume/util" + "k8s.io/utils/strings" ) // ProbeVolumePlugins is the primary entrypoint for volume plugins. @@ -200,7 +200,7 @@ func (plugin *glusterfsPlugin) newMounterInternal(spec *volume.Spec, ep *v1.Endp mounter: mounter, pod: pod, plugin: plugin, - MetricsProvider: volume.NewMetricsStatFS(plugin.host.GetPodVolumeDir(pod.UID, strings.EscapeQualifiedNameForDisk(glusterfsPluginName), spec.Name())), + MetricsProvider: volume.NewMetricsStatFS(plugin.host.GetPodVolumeDir(pod.UID, strings.EscapeQualifiedName(glusterfsPluginName), spec.Name())), }, hosts: ep, path: volPath, @@ -219,7 +219,7 @@ func (plugin *glusterfsPlugin) newUnmounterInternal(volName string, podUID types mounter: mounter, pod: &v1.Pod{ObjectMeta: metav1.ObjectMeta{UID: podUID}}, plugin: plugin, - MetricsProvider: volume.NewMetricsStatFS(plugin.host.GetPodVolumeDir(podUID, strings.EscapeQualifiedNameForDisk(glusterfsPluginName), volName)), + MetricsProvider: volume.NewMetricsStatFS(plugin.host.GetPodVolumeDir(podUID, strings.EscapeQualifiedName(glusterfsPluginName), volName)), }}, nil } @@ -301,7 +301,7 @@ func (b *glusterfsMounter) SetUpAt(dir string, fsGroup *int64) error { func (glusterfsVolume *glusterfs) GetPath() string { name := glusterfsPluginName - return glusterfsVolume.plugin.host.GetPodVolumeDir(glusterfsVolume.pod.UID, strings.EscapeQualifiedNameForDisk(name), glusterfsVolume.volName) + return glusterfsVolume.plugin.host.GetPodVolumeDir(glusterfsVolume.pod.UID, strings.EscapeQualifiedName(name), glusterfsVolume.volName) } type glusterfsUnmounter struct { @@ -542,7 +542,7 @@ type glusterfsVolumeDeleter struct { func (d *glusterfsVolumeDeleter) GetPath() string { name := glusterfsPluginName - return d.plugin.host.GetPodVolumeDir(d.glusterfsMounter.glusterfs.pod.UID, strings.EscapeQualifiedNameForDisk(name), d.glusterfsMounter.glusterfs.volName) + return d.plugin.host.GetPodVolumeDir(d.glusterfsMounter.glusterfs.pod.UID, strings.EscapeQualifiedName(name), d.glusterfsMounter.glusterfs.volName) } // Traverse the PVs, fetching all the GIDs from those diff --git a/pkg/volume/iscsi/BUILD b/pkg/volume/iscsi/BUILD index f9632a1e86..d076457c16 100644 --- a/pkg/volume/iscsi/BUILD +++ b/pkg/volume/iscsi/BUILD @@ -19,7 +19,6 @@ go_library( deps = [ "//pkg/features:go_default_library", "//pkg/util/mount:go_default_library", - "//pkg/util/strings:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/util:go_default_library", "//pkg/volume/util/volumepathhandler:go_default_library", @@ -29,6 +28,7 @@ go_library( "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", "//vendor/k8s.io/klog:go_default_library", "//vendor/k8s.io/utils/keymutex:go_default_library", + "//vendor/k8s.io/utils/strings:go_default_library", ], ) diff --git a/pkg/volume/iscsi/iscsi.go b/pkg/volume/iscsi/iscsi.go index aebf15c390..334df9ee57 100644 --- a/pkg/volume/iscsi/iscsi.go +++ b/pkg/volume/iscsi/iscsi.go @@ -28,11 +28,11 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/klog" "k8s.io/kubernetes/pkg/util/mount" - utilstrings "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" ioutil "k8s.io/kubernetes/pkg/volume/util" "k8s.io/kubernetes/pkg/volume/util/volumepathhandler" "k8s.io/utils/keymutex" + utilsstrings "k8s.io/utils/strings" ) // This is the primary entrypoint for volume plugins. @@ -181,7 +181,7 @@ func (plugin *iscsiPlugin) newUnmounterInternal(volName string, podUID types.UID VolName: volName, manager: manager, plugin: plugin, - MetricsProvider: volume.NewMetricsStatFS(plugin.host.GetPodVolumeDir(podUID, utilstrings.EscapeQualifiedNameForDisk(iscsiPluginName), volName)), + MetricsProvider: volume.NewMetricsStatFS(plugin.host.GetPodVolumeDir(podUID, utilsstrings.EscapeQualifiedName(iscsiPluginName), volName)), }, mounter: mounter, exec: exec, @@ -285,7 +285,7 @@ type iscsiDisk struct { func (iscsi *iscsiDisk) GetPath() string { name := iscsiPluginName // safe to use PodVolumeDir now: volume teardown occurs before pod is cleaned up - return iscsi.plugin.host.GetPodVolumeDir(iscsi.podUID, utilstrings.EscapeQualifiedNameForDisk(name), iscsi.VolName) + return iscsi.plugin.host.GetPodVolumeDir(iscsi.podUID, utilsstrings.EscapeQualifiedName(name), iscsi.VolName) } func (iscsi *iscsiDisk) iscsiGlobalMapPath(spec *volume.Spec) (string, error) { @@ -299,7 +299,7 @@ func (iscsi *iscsiDisk) iscsiGlobalMapPath(spec *volume.Spec) (string, error) { func (iscsi *iscsiDisk) iscsiPodDeviceMapPath() (string, string) { name := iscsiPluginName - return iscsi.plugin.host.GetPodVolumeDeviceDir(iscsi.podUID, utilstrings.EscapeQualifiedNameForDisk(name)), iscsi.VolName + return iscsi.plugin.host.GetPodVolumeDeviceDir(iscsi.podUID, utilsstrings.EscapeQualifiedName(name)), iscsi.VolName } type iscsiDiskMounter struct { diff --git a/pkg/volume/local/BUILD b/pkg/volume/local/BUILD index b078bf37b1..63f2323d7a 100644 --- a/pkg/volume/local/BUILD +++ b/pkg/volume/local/BUILD @@ -11,7 +11,6 @@ go_library( deps = [ "//pkg/kubelet/events:go_default_library", "//pkg/util/mount:go_default_library", - "//pkg/util/strings:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/util:go_default_library", "//pkg/volume/validation:go_default_library", @@ -21,6 +20,7 @@ go_library( "//staging/src/k8s.io/client-go/tools/record:go_default_library", "//vendor/k8s.io/klog:go_default_library", "//vendor/k8s.io/utils/keymutex:go_default_library", + "//vendor/k8s.io/utils/strings:go_default_library", ], ) diff --git a/pkg/volume/local/local.go b/pkg/volume/local/local.go index 29e8f64505..ecad69301b 100644 --- a/pkg/volume/local/local.go +++ b/pkg/volume/local/local.go @@ -31,11 +31,11 @@ import ( "k8s.io/client-go/tools/record" "k8s.io/kubernetes/pkg/kubelet/events" "k8s.io/kubernetes/pkg/util/mount" - stringsutil "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/util" "k8s.io/kubernetes/pkg/volume/validation" "k8s.io/utils/keymutex" + utilsstrings "k8s.io/utils/strings" ) const ( @@ -132,7 +132,7 @@ func (plugin *localVolumePlugin) NewMounter(spec *volume.Spec, pod *v1.Pod, _ vo mounter: plugin.host.GetMounter(plugin.GetPluginName()), plugin: plugin, globalPath: globalLocalPath, - MetricsProvider: volume.NewMetricsStatFS(plugin.host.GetPodVolumeDir(pod.UID, stringsutil.EscapeQualifiedNameForDisk(localVolumePluginName), spec.Name())), + MetricsProvider: volume.NewMetricsStatFS(plugin.host.GetPodVolumeDir(pod.UID, utilsstrings.EscapeQualifiedName(localVolumePluginName), spec.Name())), }, mountOptions: util.MountOptionFromSpec(spec), readOnly: readOnly, @@ -392,7 +392,7 @@ type localVolume struct { } func (l *localVolume) GetPath() string { - return l.plugin.host.GetPodVolumeDir(l.podUID, stringsutil.EscapeQualifiedNameForDisk(localVolumePluginName), l.volName) + return l.plugin.host.GetPodVolumeDir(l.podUID, utilsstrings.EscapeQualifiedName(localVolumePluginName), l.volName) } type localVolumeMounter struct { @@ -584,7 +584,7 @@ func (u *localVolumeUnmapper) TearDownDevice(mapPath, _ string) error { // GetGlobalMapPath returns global map path and error. // path: plugins/kubernetes.io/kubernetes.io/local-volume/volumeDevices/{volumeName} func (lv *localVolume) GetGlobalMapPath(spec *volume.Spec) (string, error) { - return filepath.Join(lv.plugin.host.GetVolumeDevicePluginDir(stringsutil.EscapeQualifiedNameForDisk(localVolumePluginName)), + return filepath.Join(lv.plugin.host.GetVolumeDevicePluginDir(utilsstrings.EscapeQualifiedName(localVolumePluginName)), lv.volName), nil } @@ -593,5 +593,5 @@ func (lv *localVolume) GetGlobalMapPath(spec *volume.Spec) (string, error) { // volName: local-pv-ff0d6d4 func (lv *localVolume) GetPodDeviceMapPath() (string, string) { return lv.plugin.host.GetPodVolumeDeviceDir(lv.podUID, - stringsutil.EscapeQualifiedNameForDisk(localVolumePluginName)), lv.volName + utilsstrings.EscapeQualifiedName(localVolumePluginName)), lv.volName } diff --git a/pkg/volume/nfs/BUILD b/pkg/volume/nfs/BUILD index 28885d7fb4..42baf1177e 100644 --- a/pkg/volume/nfs/BUILD +++ b/pkg/volume/nfs/BUILD @@ -15,7 +15,6 @@ go_library( importpath = "k8s.io/kubernetes/pkg/volume/nfs", deps = [ "//pkg/util/mount:go_default_library", - "//pkg/util/strings:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/util:go_default_library", "//pkg/volume/util/recyclerclient:go_default_library", @@ -23,6 +22,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/utils/strings:go_default_library", ], ) diff --git a/pkg/volume/nfs/nfs.go b/pkg/volume/nfs/nfs.go index 20c2c5a283..e55446d3a4 100644 --- a/pkg/volume/nfs/nfs.go +++ b/pkg/volume/nfs/nfs.go @@ -26,10 +26,10 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/klog" "k8s.io/kubernetes/pkg/util/mount" - "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/util" "k8s.io/kubernetes/pkg/volume/util/recyclerclient" + "k8s.io/utils/strings" ) // This is the primary entrypoint for volume plugins. @@ -189,7 +189,7 @@ type nfs struct { func (nfsVolume *nfs) GetPath() string { name := nfsPluginName - return nfsVolume.plugin.host.GetPodVolumeDir(nfsVolume.pod.UID, strings.EscapeQualifiedNameForDisk(name), nfsVolume.volName) + return nfsVolume.plugin.host.GetPodVolumeDir(nfsVolume.pod.UID, strings.EscapeQualifiedName(name), nfsVolume.volName) } // Checks prior to mount operations to verify that the required components (binaries, etc.) diff --git a/pkg/volume/photon_pd/BUILD b/pkg/volume/photon_pd/BUILD index 61d5467e4d..97ee8e7fd9 100644 --- a/pkg/volume/photon_pd/BUILD +++ b/pkg/volume/photon_pd/BUILD @@ -17,7 +17,6 @@ go_library( deps = [ "//pkg/cloudprovider/providers/photon:go_default_library", "//pkg/util/mount:go_default_library", - "//pkg/util/strings:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/util:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -26,6 +25,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", "//staging/src/k8s.io/cloud-provider:go_default_library", "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/utils/strings:go_default_library", ], ) diff --git a/pkg/volume/photon_pd/photon_pd.go b/pkg/volume/photon_pd/photon_pd.go index f965398e40..c482782a6e 100644 --- a/pkg/volume/photon_pd/photon_pd.go +++ b/pkg/volume/photon_pd/photon_pd.go @@ -27,9 +27,9 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/klog" "k8s.io/kubernetes/pkg/util/mount" - utilstrings "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/util" + utilsstrings "k8s.io/utils/strings" ) // This is the primary entrypoint for volume plugins. @@ -290,7 +290,7 @@ func makeGlobalPDPath(host volume.VolumeHost, devName string) string { func (ppd *photonPersistentDisk) GetPath() string { name := photonPersistentDiskPluginName - return ppd.plugin.host.GetPodVolumeDir(ppd.podUID, utilstrings.EscapeQualifiedNameForDisk(name), ppd.volName) + return ppd.plugin.host.GetPodVolumeDir(ppd.podUID, utilsstrings.EscapeQualifiedName(name), ppd.volName) } // TODO: supporting more access mode for PhotonController persistent disk diff --git a/pkg/volume/portworx/BUILD b/pkg/volume/portworx/BUILD index e43ba8d037..63053513b7 100644 --- a/pkg/volume/portworx/BUILD +++ b/pkg/volume/portworx/BUILD @@ -32,7 +32,6 @@ go_library( deps = [ "//pkg/apis/core:go_default_library", "//pkg/util/mount:go_default_library", - "//pkg/util/strings:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/util:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -45,6 +44,7 @@ go_library( "//vendor/github.com/libopenstorage/openstorage/api/spec:go_default_library", "//vendor/github.com/libopenstorage/openstorage/volume:go_default_library", "//vendor/k8s.io/klog: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 6083f69416..76de9e6479 100644 --- a/pkg/volume/portworx/portworx.go +++ b/pkg/volume/portworx/portworx.go @@ -27,9 +27,9 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/klog" "k8s.io/kubernetes/pkg/util/mount" - kstrings "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/util" + utilsstrings "k8s.io/utils/strings" ) const ( @@ -58,7 +58,7 @@ const ( ) func getPath(uid types.UID, volName string, host volume.VolumeHost) string { - return host.GetPodVolumeDir(uid, kstrings.EscapeQualifiedNameForDisk(portworxVolumePluginName), volName) + return host.GetPodVolumeDir(uid, utilsstrings.EscapeQualifiedName(portworxVolumePluginName), volName) } func (plugin *portworxVolumePlugin) Init(host volume.VolumeHost) error { diff --git a/pkg/volume/projected/BUILD b/pkg/volume/projected/BUILD index 65883f906b..d3685747bf 100644 --- a/pkg/volume/projected/BUILD +++ b/pkg/volume/projected/BUILD @@ -36,7 +36,6 @@ go_library( importpath = "k8s.io/kubernetes/pkg/volume/projected", deps = [ "//pkg/features:go_default_library", - "//pkg/util/strings:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/configmap:go_default_library", "//pkg/volume/downwardapi:go_default_library", @@ -50,6 +49,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/util/errors:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/utils/strings:go_default_library", ], ) diff --git a/pkg/volume/projected/projected.go b/pkg/volume/projected/projected.go index 6b18ca3175..c8d51bb250 100644 --- a/pkg/volume/projected/projected.go +++ b/pkg/volume/projected/projected.go @@ -26,15 +26,14 @@ import ( "k8s.io/apimachinery/pkg/types" utilerrors "k8s.io/apimachinery/pkg/util/errors" utilfeature "k8s.io/apiserver/pkg/util/feature" + "k8s.io/klog" "k8s.io/kubernetes/pkg/features" - utilstrings "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/configmap" "k8s.io/kubernetes/pkg/volume/downwardapi" "k8s.io/kubernetes/pkg/volume/secret" volumeutil "k8s.io/kubernetes/pkg/volume/util" - - "k8s.io/klog" + utilsstrings "k8s.io/utils/strings" ) // ProbeVolumePlugins is the entry point for plugin detection in a package. @@ -67,7 +66,7 @@ func wrappedVolumeSpec() volume.Spec { } func getPath(uid types.UID, volName string, host volume.VolumeHost) string { - return host.GetPodVolumeDir(uid, utilstrings.EscapeQualifiedNameForDisk(projectedPluginName), volName) + return host.GetPodVolumeDir(uid, utilsstrings.EscapeQualifiedName(projectedPluginName), volName) } func (plugin *projectedPlugin) Init(host volume.VolumeHost) error { diff --git a/pkg/volume/quobyte/BUILD b/pkg/volume/quobyte/BUILD index 1142f5f633..fe0c047f72 100644 --- a/pkg/volume/quobyte/BUILD +++ b/pkg/volume/quobyte/BUILD @@ -16,7 +16,6 @@ go_library( importpath = "k8s.io/kubernetes/pkg/volume/quobyte", deps = [ "//pkg/util/mount:go_default_library", - "//pkg/util/strings:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/util:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -26,6 +25,7 @@ go_library( "//vendor/github.com/pborman/uuid:go_default_library", "//vendor/github.com/quobyte/api:go_default_library", "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/utils/strings:go_default_library", ], ) diff --git a/pkg/volume/quobyte/quobyte.go b/pkg/volume/quobyte/quobyte.go index a0c85c5b77..136e72e392 100644 --- a/pkg/volume/quobyte/quobyte.go +++ b/pkg/volume/quobyte/quobyte.go @@ -29,9 +29,9 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/klog" "k8s.io/kubernetes/pkg/util/mount" - "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/util" + "k8s.io/utils/strings" ) // ProbeVolumePlugins is the primary entrypoint for volume plugins. @@ -92,7 +92,7 @@ func (plugin *quobytePlugin) CanSupport(spec *volume.Spec) bool { // If Quobyte is already mounted we don't need to check if the binary is installed if mounter, err := plugin.newMounterInternal(spec, nil, plugin.host.GetMounter(plugin.GetPluginName())); err == nil { qm, _ := mounter.(*quobyteMounter) - pluginDir := plugin.host.GetPluginDir(strings.EscapeQualifiedNameForDisk(quobytePluginName)) + pluginDir := plugin.host.GetPluginDir(strings.EscapeQualifiedName(quobytePluginName)) if mounted, err := qm.pluginDirIsMounted(pluginDir); mounted && err == nil { klog.V(4).Infof("quobyte: can support") return true @@ -238,7 +238,7 @@ func (mounter *quobyteMounter) CanMount() error { // SetUp attaches the disk and bind mounts to the volume path. func (mounter *quobyteMounter) SetUp(fsGroup *int64) error { - pluginDir := mounter.plugin.host.GetPluginDir(strings.EscapeQualifiedNameForDisk(quobytePluginName)) + pluginDir := mounter.plugin.host.GetPluginDir(strings.EscapeQualifiedName(quobytePluginName)) return mounter.SetUpAt(pluginDir, fsGroup) } @@ -284,7 +284,7 @@ func (quobyteVolume *quobyte) GetPath() string { // Quobyte has only one mount in the PluginDir where all Volumes are mounted // The Quobyte client does a fixed-user mapping - pluginDir := quobyteVolume.plugin.host.GetPluginDir(strings.EscapeQualifiedNameForDisk(quobytePluginName)) + pluginDir := quobyteVolume.plugin.host.GetPluginDir(strings.EscapeQualifiedName(quobytePluginName)) return path.Join(pluginDir, fmt.Sprintf("%s#%s@%s", user, group, quobyteVolume.volume)) } diff --git a/pkg/volume/rbd/BUILD b/pkg/volume/rbd/BUILD index ccd413eefe..0a5ca33c55 100644 --- a/pkg/volume/rbd/BUILD +++ b/pkg/volume/rbd/BUILD @@ -21,7 +21,6 @@ go_library( "//pkg/util/file:go_default_library", "//pkg/util/mount:go_default_library", "//pkg/util/node:go_default_library", - "//pkg/util/strings:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/util:go_default_library", "//pkg/volume/util/volumepathhandler:go_default_library", @@ -36,6 +35,7 @@ go_library( "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/utils/strings:go_default_library", ], ) diff --git a/pkg/volume/rbd/rbd.go b/pkg/volume/rbd/rbd.go index d806b964a4..0945baa145 100644 --- a/pkg/volume/rbd/rbd.go +++ b/pkg/volume/rbd/rbd.go @@ -34,10 +34,10 @@ import ( "k8s.io/klog" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/util/mount" - "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" volutil "k8s.io/kubernetes/pkg/volume/util" "k8s.io/kubernetes/pkg/volume/util/volumepathhandler" + "k8s.io/utils/strings" ) var ( @@ -75,7 +75,7 @@ const ( ) func getPath(uid types.UID, volName string, host volume.VolumeHost) string { - return host.GetPodVolumeDir(uid, strings.EscapeQualifiedNameForDisk(rbdPluginName), volName) + return host.GetPodVolumeDir(uid, strings.EscapeQualifiedName(rbdPluginName), volName) } func (plugin *rbdPlugin) Init(host volume.VolumeHost) error { @@ -930,7 +930,7 @@ func (rbd *rbd) rbdGlobalMapPath(spec *volume.Spec) (string, error) { func (rbd *rbd) rbdPodDeviceMapPath() (string, string) { name := rbdPluginName - return rbd.plugin.host.GetPodVolumeDeviceDir(rbd.podUID, strings.EscapeQualifiedNameForDisk(name)), rbd.volName + return rbd.plugin.host.GetPodVolumeDeviceDir(rbd.podUID, strings.EscapeQualifiedName(name)), rbd.volName } type rbdDiskUnmapper struct { diff --git a/pkg/volume/scaleio/BUILD b/pkg/volume/scaleio/BUILD index 4e8fb80242..a5c98810a2 100644 --- a/pkg/volume/scaleio/BUILD +++ b/pkg/volume/scaleio/BUILD @@ -41,7 +41,6 @@ go_library( importpath = "k8s.io/kubernetes/pkg/volume/scaleio", deps = [ "//pkg/util/mount:go_default_library", - "//pkg/util/strings:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/util:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -53,6 +52,7 @@ go_library( "//vendor/github.com/codedellemc/goscaleio/types/v1:go_default_library", "//vendor/k8s.io/klog:go_default_library", "//vendor/k8s.io/utils/keymutex: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 c73e16ae96..7d07b4a964 100644 --- a/pkg/volume/scaleio/sio_volume.go +++ b/pkg/volume/scaleio/sio_volume.go @@ -30,9 +30,9 @@ import ( "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/klog" "k8s.io/kubernetes/pkg/util/mount" - kstrings "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/util" + utilsstrings "k8s.io/utils/strings" ) type sioVolume struct { @@ -61,7 +61,7 @@ var _ volume.Volume = &sioVolume{} func (v *sioVolume) GetPath() string { return v.plugin.host.GetPodVolumeDir( v.podUID, - kstrings.EscapeQualifiedNameForDisk(sioPluginName), + utilsstrings.EscapeQualifiedName(sioPluginName), v.volSpecName) } diff --git a/pkg/volume/secret/BUILD b/pkg/volume/secret/BUILD index d44d59dd61..288808826f 100644 --- a/pkg/volume/secret/BUILD +++ b/pkg/volume/secret/BUILD @@ -15,7 +15,6 @@ go_library( importpath = "k8s.io/kubernetes/pkg/volume/secret", deps = [ "//pkg/util/mount:go_default_library", - "//pkg/util/strings:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/util:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -23,6 +22,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/utils/strings:go_default_library", ], ) diff --git a/pkg/volume/secret/secret.go b/pkg/volume/secret/secret.go index f58b9b9262..0536dfc23a 100644 --- a/pkg/volume/secret/secret.go +++ b/pkg/volume/secret/secret.go @@ -25,9 +25,9 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/klog" "k8s.io/kubernetes/pkg/util/mount" - "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" volumeutil "k8s.io/kubernetes/pkg/volume/util" + "k8s.io/utils/strings" ) // ProbeVolumePlugins is the entry point for plugin detection in a package. @@ -54,7 +54,7 @@ func wrappedVolumeSpec() volume.Spec { } func getPath(uid types.UID, volName string, host volume.VolumeHost) string { - return host.GetPodVolumeDir(uid, strings.EscapeQualifiedNameForDisk(secretPluginName), volName) + return host.GetPodVolumeDir(uid, strings.EscapeQualifiedName(secretPluginName), volName) } func (plugin *secretPlugin) Init(host volume.VolumeHost) error { diff --git a/pkg/volume/storageos/BUILD b/pkg/volume/storageos/BUILD index c89c5fee55..ebfc86e0b3 100644 --- a/pkg/volume/storageos/BUILD +++ b/pkg/volume/storageos/BUILD @@ -16,7 +16,6 @@ go_library( importpath = "k8s.io/kubernetes/pkg/volume/storageos", deps = [ "//pkg/util/mount:go_default_library", - "//pkg/util/strings:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/util:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -27,6 +26,7 @@ go_library( "//vendor/github.com/storageos/go-api:go_default_library", "//vendor/github.com/storageos/go-api/types:go_default_library", "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/utils/strings:go_default_library", ], ) diff --git a/pkg/volume/storageos/storageos.go b/pkg/volume/storageos/storageos.go index e65cdc5204..9c3b0f80de 100644 --- a/pkg/volume/storageos/storageos.go +++ b/pkg/volume/storageos/storageos.go @@ -24,17 +24,16 @@ import ( "path/filepath" "strings" - "k8s.io/klog" - "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" clientset "k8s.io/client-go/kubernetes" + "k8s.io/klog" "k8s.io/kubernetes/pkg/util/mount" - kstrings "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/util" + utilsstrings "k8s.io/utils/strings" ) // ProbeVolumePlugins is the primary entrypoint for volume plugins. @@ -64,9 +63,9 @@ const ( func getPath(uid types.UID, volNamespace string, volName string, pvName string, host volume.VolumeHost) string { if len(volNamespace) != 0 && len(volName) != 0 && strings.Count(volName, ".") == 0 { - return host.GetPodVolumeDir(uid, kstrings.EscapeQualifiedNameForDisk(storageosPluginName), pvName+"."+volNamespace+"."+volName) + return host.GetPodVolumeDir(uid, utilsstrings.EscapeQualifiedName(storageosPluginName), pvName+"."+volNamespace+"."+volName) } - return host.GetPodVolumeDir(uid, kstrings.EscapeQualifiedNameForDisk(storageosPluginName), pvName) + return host.GetPodVolumeDir(uid, utilsstrings.EscapeQualifiedName(storageosPluginName), pvName) } func (plugin *storageosPlugin) Init(host volume.VolumeHost) error { @@ -432,7 +431,7 @@ func (b *storageosMounter) SetUpAt(dir string, fsGroup *int64) error { } func makeGlobalPDName(host volume.VolumeHost, pvName, volNamespace, volName string) string { - return path.Join(host.GetPluginDir(kstrings.EscapeQualifiedNameForDisk(storageosPluginName)), mount.MountsInGlobalPDPath, pvName+"."+volNamespace+"."+volName) + return path.Join(host.GetPluginDir(utilsstrings.EscapeQualifiedName(storageosPluginName)), mount.MountsInGlobalPDPath, pvName+"."+volNamespace+"."+volName) } // Given the pod id and PV name, finds the volume's namespace and name from the @@ -444,7 +443,7 @@ func getVolumeInfo(pvName string, podUID types.UID, host volume.VolumeHost) (str return volNamespace, volName, nil } - volumeDir := filepath.Dir(host.GetPodVolumeDir(podUID, kstrings.EscapeQualifiedNameForDisk(storageosPluginName), pvName)) + volumeDir := filepath.Dir(host.GetPodVolumeDir(podUID, utilsstrings.EscapeQualifiedName(storageosPluginName), pvName)) files, err := ioutil.ReadDir(volumeDir) if err != nil { return "", "", fmt.Errorf("Could not read mounts from pod volume dir: %s", err) diff --git a/pkg/volume/testing/BUILD b/pkg/volume/testing/BUILD index 16d3406a92..f477a3996b 100644 --- a/pkg/volume/testing/BUILD +++ b/pkg/volume/testing/BUILD @@ -14,7 +14,6 @@ go_library( importpath = "k8s.io/kubernetes/pkg/volume/testing", deps = [ "//pkg/util/mount:go_default_library", - "//pkg/util/strings:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/util:go_default_library", "//pkg/volume/util/recyclerclient:go_default_library", @@ -31,6 +30,7 @@ go_library( "//staging/src/k8s.io/cloud-provider:go_default_library", "//staging/src/k8s.io/csi-api/pkg/client/clientset/versioned:go_default_library", "//vendor/github.com/stretchr/testify/mock: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 129b8de73c..07c19b6215 100644 --- a/pkg/volume/testing/testing.go +++ b/pkg/volume/testing/testing.go @@ -39,11 +39,11 @@ import ( cloudprovider "k8s.io/cloud-provider" csiclientset "k8s.io/csi-api/pkg/client/clientset/versioned" "k8s.io/kubernetes/pkg/util/mount" - utilstrings "k8s.io/kubernetes/pkg/util/strings" . "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/util" "k8s.io/kubernetes/pkg/volume/util/recyclerclient" "k8s.io/kubernetes/pkg/volume/util/volumepathhandler" + utilsstrings "k8s.io/utils/strings" ) const ( @@ -765,7 +765,7 @@ func (fv *FakeVolume) GetPath() string { } func (fv *FakeVolume) getPath() string { - return path.Join(fv.Plugin.Host.GetPodVolumeDir(fv.PodUID, utilstrings.EscapeQualifiedNameForDisk(fv.Plugin.PluginName), fv.VolName)) + return path.Join(fv.Plugin.Host.GetPodVolumeDir(fv.PodUID, utilsstrings.EscapeQualifiedName(fv.Plugin.PluginName), fv.VolName)) } func (fv *FakeVolume) TearDown() error { @@ -810,7 +810,7 @@ func (fv *FakeVolume) GetGlobalMapPath(spec *Spec) (string, error) { // Block volume support func (fv *FakeVolume) getGlobalMapPath() (string, error) { - return path.Join(fv.Plugin.Host.GetVolumeDevicePluginDir(utilstrings.EscapeQualifiedNameForDisk(fv.Plugin.PluginName)), "pluginDependentPath"), nil + return path.Join(fv.Plugin.Host.GetVolumeDevicePluginDir(utilsstrings.EscapeQualifiedName(fv.Plugin.PluginName)), "pluginDependentPath"), nil } // Block volume support @@ -830,7 +830,7 @@ func (fv *FakeVolume) GetPodDeviceMapPath() (string, string) { // Block volume support func (fv *FakeVolume) getPodDeviceMapPath() (string, string) { - return path.Join(fv.Plugin.Host.GetPodVolumeDeviceDir(fv.PodUID, utilstrings.EscapeQualifiedNameForDisk(fv.Plugin.PluginName))), fv.VolName + return path.Join(fv.Plugin.Host.GetPodVolumeDeviceDir(fv.PodUID, utilsstrings.EscapeQualifiedName(fv.Plugin.PluginName))), fv.VolName } // Block volume support diff --git a/pkg/volume/util/BUILD b/pkg/volume/util/BUILD index d2bcab775e..d325599af3 100644 --- a/pkg/volume/util/BUILD +++ b/pkg/volume/util/BUILD @@ -26,7 +26,6 @@ go_library( "//pkg/kubelet/apis:go_default_library", "//pkg/util/mount:go_default_library", "//pkg/util/resizefs:go_default_library", - "//pkg/util/strings:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/util/types:go_default_library", "//pkg/volume/util/volumepathhandler:go_default_library", @@ -43,6 +42,7 @@ go_library( "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//vendor/github.com/prometheus/client_golang/prometheus:go_default_library", "//vendor/k8s.io/klog:go_default_library", + "//vendor/k8s.io/utils/strings:go_default_library", ], ) diff --git a/pkg/volume/util/util.go b/pkg/volume/util/util.go index 8de0469f50..f2de07e2b5 100644 --- a/pkg/volume/util/util.go +++ b/pkg/volume/util/util.go @@ -18,17 +18,23 @@ package util import ( "fmt" + "hash/fnv" "io/ioutil" + "math/rand" "os" "path" "path/filepath" + "reflect" + "strconv" "strings" v1 "k8s.io/api/core/v1" storage "k8s.io/api/storage/v1" + "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + utypes "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/sets" utilfeature "k8s.io/apiserver/pkg/util/feature" clientset "k8s.io/client-go/kubernetes" @@ -38,19 +44,10 @@ import ( "k8s.io/kubernetes/pkg/features" kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" "k8s.io/kubernetes/pkg/util/mount" - utilstrings "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" - - "reflect" - - "hash/fnv" - "math/rand" - "strconv" - - "k8s.io/apimachinery/pkg/api/resource" - utypes "k8s.io/apimachinery/pkg/types" "k8s.io/kubernetes/pkg/volume/util/types" "k8s.io/kubernetes/pkg/volume/util/volumepathhandler" + utilsstrings "k8s.io/utils/strings" ) const ( @@ -823,7 +820,7 @@ func GetPersistentVolumeClaimVolumeMode(claim *v1.PersistentVolumeClaim) (v1.Per // GetPersistentVolumeClaimQualifiedName returns a qualified name for pvc. func GetPersistentVolumeClaimQualifiedName(claim *v1.PersistentVolumeClaim) string { - return utilstrings.JoinQualifiedName(claim.GetNamespace(), claim.GetName()) + return utilsstrings.JoinQualifiedName(claim.GetNamespace(), claim.GetName()) } // CheckVolumeModeFilesystem checks VolumeMode. diff --git a/pkg/volume/vsphere_volume/BUILD b/pkg/volume/vsphere_volume/BUILD index 2c948b7446..bbdbdd4e47 100644 --- a/pkg/volume/vsphere_volume/BUILD +++ b/pkg/volume/vsphere_volume/BUILD @@ -20,7 +20,6 @@ go_library( "//pkg/cloudprovider/providers/vsphere/vclib:go_default_library", "//pkg/features:go_default_library", "//pkg/util/mount:go_default_library", - "//pkg/util/strings:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/util:go_default_library", "//pkg/volume/util/volumepathhandler:go_default_library", @@ -32,6 +31,7 @@ go_library( "//staging/src/k8s.io/cloud-provider:go_default_library", "//vendor/k8s.io/klog:go_default_library", "//vendor/k8s.io/utils/keymutex:go_default_library", + "//vendor/k8s.io/utils/strings:go_default_library", ], ) diff --git a/pkg/volume/vsphere_volume/vsphere_volume.go b/pkg/volume/vsphere_volume/vsphere_volume.go index 29cb1d0e23..eca2523314 100644 --- a/pkg/volume/vsphere_volume/vsphere_volume.go +++ b/pkg/volume/vsphere_volume/vsphere_volume.go @@ -30,9 +30,9 @@ import ( "k8s.io/klog" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/util/mount" - utilstrings "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/util" + utilsstrings "k8s.io/utils/strings" ) // This is the primary entrypoint for volume plugins. @@ -54,7 +54,7 @@ const ( ) func getPath(uid types.UID, volName string, host volume.VolumeHost) string { - return host.GetPodVolumeDir(uid, utilstrings.EscapeQualifiedNameForDisk(vsphereVolumePluginName), volName) + return host.GetPodVolumeDir(uid, utilsstrings.EscapeQualifiedName(vsphereVolumePluginName), volName) } // vSphere Volume Plugin @@ -298,7 +298,7 @@ func makeGlobalPDPath(host volume.VolumeHost, devName string) string { func (vv *vsphereVolume) GetPath() string { name := vsphereVolumePluginName - return vv.plugin.host.GetPodVolumeDir(vv.podUID, utilstrings.EscapeQualifiedNameForDisk(name), vv.volName) + return vv.plugin.host.GetPodVolumeDir(vv.podUID, utilsstrings.EscapeQualifiedName(name), vv.volName) } // vSphere Persistent Volume Plugin diff --git a/pkg/volume/vsphere_volume/vsphere_volume_block.go b/pkg/volume/vsphere_volume/vsphere_volume_block.go index 40342b8aac..806002b6f0 100644 --- a/pkg/volume/vsphere_volume/vsphere_volume_block.go +++ b/pkg/volume/vsphere_volume/vsphere_volume_block.go @@ -26,10 +26,10 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/klog" "k8s.io/kubernetes/pkg/util/mount" - kstrings "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/util" "k8s.io/kubernetes/pkg/volume/util/volumepathhandler" + utilsstrings "k8s.io/utils/strings" ) var _ volume.BlockVolumePlugin = &vsphereVolumePlugin{} @@ -157,5 +157,5 @@ func (v *vsphereVolume) GetGlobalMapPath(spec *volume.Spec) (string, error) { } func (v *vsphereVolume) GetPodDeviceMapPath() (string, string) { - return v.plugin.host.GetPodVolumeDeviceDir(v.podUID, kstrings.EscapeQualifiedNameForDisk(vsphereVolumePluginName)), v.volName + return v.plugin.host.GetPodVolumeDeviceDir(v.podUID, utilsstrings.EscapeQualifiedName(vsphereVolumePluginName)), v.volName }