github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #21805 from childsb/CanSupport_fix 

Auto commit by PR queue bot
pull/6/head
k8s-merge-robot 2016-03-05 10:09:35 -08:00
parent 2e03822386 7fed6f9f47
commit 3c5b57b217
3 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/volume/fc/fc.go
View File

@ -59,15 +59,8 @@ func (plugin *fcPlugin) CanSupport(spec *volume.Spec) bool {
if (spec.Volume != nil && spec.Volume.FC == nil) || (spec.PersistentVolume != nil && spec.PersistentVolume.Spec.FC == nil) {
return false
}
// TODO: turn this into a func so CanSupport can be unit tested without
// having to make system calls
// see if /sys/class/fc_transport is there, which indicates fc is connected
_, err := plugin.execCommand("ls", []string{"/sys/class/fc_transport"})
if err == nil {
return true
}
return false
return true
}
func (plugin *fcPlugin) GetAccessModes() []api.PersistentVolumeAccessMode {

9
pkg/volume/iscsi/iscsi.go
View File

@ -59,15 +59,8 @@ func (plugin *iscsiPlugin) CanSupport(spec *volume.Spec) bool {
if (spec.Volume != nil && spec.Volume.ISCSI == nil) || (spec.PersistentVolume != nil && spec.PersistentVolume.Spec.ISCSI == nil) {
return false
}
// TODO: turn this into a func so CanSupport can be unit tested without
// having to make system calls
// see if iscsiadm is there
_, err := plugin.execCommand("iscsiadm", []string{"-h"})
if err == nil {
return true
}
return false
return true
}
func (plugin *iscsiPlugin) GetAccessModes() []api.PersistentVolumeAccessMode {

7
pkg/volume/rbd/rbd.go
View File

@ -58,13 +58,8 @@ func (plugin *rbdPlugin) CanSupport(spec *volume.Spec) bool {
if (spec.Volume != nil && spec.Volume.RBD == nil) || (spec.PersistentVolume != nil && spec.PersistentVolume.Spec.RBD == nil) {
return false
}
// see if rbd is there
_, err := plugin.execCommand("rbd", []string{"-h"})
if err == nil {
return true
}
return false
return true
}
func (plugin *rbdPlugin) GetAccessModes() []api.PersistentVolumeAccessMode {