From 61f6c3bc13c5cc2fdedbc7ee0e2f278b49f74076 Mon Sep 17 00:00:00 2001 From: childsb Date: Tue, 23 Feb 2016 09:40:35 -0600 Subject: [PATCH 1/2] Remove the check for a gluster specific binary in 'canSupport'. Causes problems in containerized kube. --- pkg/volume/glusterfs/glusterfs.go | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkg/volume/glusterfs/glusterfs.go b/pkg/volume/glusterfs/glusterfs.go index f6f92a8b79c..957e4137a83 100644 --- a/pkg/volume/glusterfs/glusterfs.go +++ b/pkg/volume/glusterfs/glusterfs.go @@ -61,15 +61,8 @@ func (plugin *glusterfsPlugin) CanSupport(spec *volume.Spec) bool { (spec.Volume != nil && spec.Volume.Glusterfs == nil) { return false } - // see if glusterfs mount helper is there - // this needs a ls because the plugin container may be on a filesystem - // that is not visible to the volume plugin process. - _, err := plugin.execCommand("ls", []string{"/sbin/mount.glusterfs"}) - if err == nil { - return true - } - - return false + + return true } From 8d4aa5d387d738e8bd615fb028b642994ac0fd87 Mon Sep 17 00:00:00 2001 From: childsb Date: Thu, 25 Feb 2016 13:00:12 -0600 Subject: [PATCH 2/2] Run through gofmt -s --- pkg/volume/glusterfs/glusterfs.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/volume/glusterfs/glusterfs.go b/pkg/volume/glusterfs/glusterfs.go index 957e4137a83..b4dae8167cf 100644 --- a/pkg/volume/glusterfs/glusterfs.go +++ b/pkg/volume/glusterfs/glusterfs.go @@ -61,7 +61,7 @@ func (plugin *glusterfsPlugin) CanSupport(spec *volume.Spec) bool { (spec.Volume != nil && spec.Volume.Glusterfs == nil) { return false } - + return true }