diff --git a/pkg/volume/configmap/configmap.go b/pkg/volume/configmap/configmap.go index cd5995e55f3..0180c051b63 100644 --- a/pkg/volume/configmap/configmap.go +++ b/pkg/volume/configmap/configmap.go @@ -60,7 +60,10 @@ func (plugin *configMapPlugin) GetVolumeName(spec *volume.Spec) (string, error) return "", fmt.Errorf("Spec does not reference a ConfigMap volume type") } - return volumeSource.Name, nil + return fmt.Sprintf( + "%v/%v", + spec.Name(), + volumeSource.Name), nil } func (plugin *configMapPlugin) CanSupport(spec *volume.Spec) bool { diff --git a/pkg/volume/configmap/configmap_test.go b/pkg/volume/configmap/configmap_test.go index 924cc63140f..6367d3aa735 100644 --- a/pkg/volume/configmap/configmap_test.go +++ b/pkg/volume/configmap/configmap_test.go @@ -237,6 +237,14 @@ func TestPlugin(t *testing.T) { t.Errorf("Got a nil Mounter") } + vName, err := plugin.GetVolumeName(volume.NewSpecFromVolume(volumeSpec)) + if err != nil { + t.Errorf("Failed to GetVolumeName: %v", err) + } + if vName != "test_volume_name/test_configmap_name" { + t.Errorf("Got unexpect VolumeName %v", vName) + } + volumePath := mounter.GetPath() if !strings.HasSuffix(volumePath, fmt.Sprintf("pods/test_pod_uid/volumes/kubernetes.io~configmap/test_volume_name")) { t.Errorf("Got unexpected path: %s", volumePath)