Merge pull request #55796 from humblec/construct

Automatic merge from submit-queue (batch tested with PRs 55938, 56055, 53385, 55796, 55922). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Avoid wrong filling of glusterfs Volume Spec at ConstructVolumeSpec() Issue#https://github.com/kubernetes/kubernetes/issues/37625, https://github.com/kubernetes/kubernetes/issues/49108Signed-off-by: Humble Chirammal <hchiramm@redhat.com>

Merge pull request #55796 from humblec/construct
8440a509 · Kubernetes Submit Queue · GitHub · 1d7f7eaf · 13a86d81 · 8440a509
Unverified Commit 8440a509 authored Nov 21, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 21, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 10 deletions

glusterfs.go pkg/volume/glusterfs/glusterfs.go +5 -10

No files found.
--- a/pkg/volume/glusterfs/glusterfs.go
+++ b/pkg/volume/glusterfs/glusterfs.go
@@ -197,16 +197,11 @@ func (plugin *glusterfsPlugin) newUnmounterInternal(volName string, podUID types
 }

 func (plugin *glusterfsPlugin) ConstructVolumeSpec(volumeName, mountPath string) (*volume.Spec, error) {
-	glusterfsVolume := &v1.Volume{
-		Name: volumeName,
-		VolumeSource: v1.VolumeSource{
-			Glusterfs: &v1.GlusterfsVolumeSource{
-				EndpointsName: volumeName,
-				Path:          volumeName,
-			},
-		},
-	}
-	return volume.NewSpecFromVolume(glusterfsVolume), nil
+
+	// To reconstrcut volume spec we need endpoint where fetching endpoint from mount
+	// string looks to be impossible, so returning error.
+
+	return nil, fmt.Errorf("impossible to reconstruct glusterfs volume spec from volume mountpath")
 }

 // Glusterfs volumes represent a bare host file or directory mount of an Glusterfs export.