From 56189cf8938b160bf0929b79ab6097f1aa3b3296 Mon Sep 17 00:00:00 2001 From: mlmhl Date: Fri, 19 Jan 2018 17:46:04 +0800 Subject: [PATCH] use GetUniqueVolumeNameFromSpec instead of implementing it manually --- pkg/kubelet/volumemanager/reconciler/reconciler.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkg/kubelet/volumemanager/reconciler/reconciler.go b/pkg/kubelet/volumemanager/reconciler/reconciler.go index 2cb07477c74..e6cbd88c286 100644 --- a/pkg/kubelet/volumemanager/reconciler/reconciler.go +++ b/pkg/kubelet/volumemanager/reconciler/reconciler.go @@ -470,13 +470,12 @@ func (rc *reconciler) reconstructVolume(volume podVolume) (*reconstructedVolume, return nil, err } - volumeName, err := plugin.GetVolumeName(volumeSpec) - if err != nil { - return nil, err - } var uniqueVolumeName v1.UniqueVolumeName if attachablePlugin != nil { - uniqueVolumeName = volumehelper.GetUniqueVolumeName(volume.pluginName, volumeName) + uniqueVolumeName, err = volumehelper.GetUniqueVolumeNameFromSpec(plugin, volumeSpec) + if err != nil { + return nil, err + } } else { uniqueVolumeName = volumehelper.GetUniqueVolumeNameForNonAttachableVolume(volume.podName, plugin, volumeSpec) }