Add spec.Name() to the configmap GetVolumeName()

This is to base the name on the volume not just on the source configMap. If you have 2 volumes that both have the same configMap as a source, the volume is see as being in the attached state (it's state is looked up based on GetVolumeName()). See bug #28502

Add spec.Name() to the configmap GetVolumeName()
d7150bfa · Angus Salkeld · 1ff33c57 · d7150bfa · d7150bfa
Commit d7150bfa authored Jul 06, 2016 by Angus Salkeld
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 1 deletion

configmap.go pkg/volume/configmap/configmap.go +4 -1

configmap_test.go pkg/volume/configmap/configmap_test.go +8 -0

No files found.
--- 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 {

--- 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)