From 63ddfa537e7917912a9d29c0fa0607441bc7adcb Mon Sep 17 00:00:00 2001 From: markturansky Date: Fri, 22 May 2015 15:23:34 -0400 Subject: [PATCH] fixed missing PV check in CanSupport --- pkg/volume/iscsi/iscsi.go | 4 +++- pkg/volume/iscsi/iscsi_test.go | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/volume/iscsi/iscsi.go b/pkg/volume/iscsi/iscsi.go index 3695642b7fe..bfc8e5986c9 100644 --- a/pkg/volume/iscsi/iscsi.go +++ b/pkg/volume/iscsi/iscsi.go @@ -53,9 +53,11 @@ func (plugin *ISCSIPlugin) Name() string { } func (plugin *ISCSIPlugin) CanSupport(spec *volume.Spec) bool { - if spec.VolumeSource.ISCSI == nil { + if spec.VolumeSource.ISCSI == nil && spec.PersistentVolumeSource.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 { diff --git a/pkg/volume/iscsi/iscsi_test.go b/pkg/volume/iscsi/iscsi_test.go index 82ec3cc5c9d..aacbf00fef5 100644 --- a/pkg/volume/iscsi/iscsi_test.go +++ b/pkg/volume/iscsi/iscsi_test.go @@ -52,7 +52,7 @@ func TestGetAccessModes(t *testing.T) { } } -func contains(modes []api.AccessModeType, mode api.AccessModeType) bool { +func contains(modes []api.PersistentVolumeAccessMode, mode api.PersistentVolumeAccessMode) bool { for _, m := range modes { if m == mode { return true