From df8795bf8feaf6151fc3917bed9f9bea61ca6e50 Mon Sep 17 00:00:00 2001 From: Humble Chirammal Date: Wed, 22 Nov 2017 19:32:37 +0530 Subject: [PATCH] UPSTREAM: 55796: Correct ConstructVolumeSpec() Signed-off-by: Humble Chirammal --- .../kubernetes/pkg/volume/glusterfs/glusterfs.go | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/vendor/k8s.io/kubernetes/pkg/volume/glusterfs/glusterfs.go b/vendor/k8s.io/kubernetes/pkg/volume/glusterfs/glusterfs.go index e1118b3ba036..4bf855b962c9 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/glusterfs/glusterfs.go +++ b/vendor/k8s.io/kubernetes/pkg/volume/glusterfs/glusterfs.go @@ -196,16 +196,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.