Skip to content
This repository was archived by the owner on Mar 22, 2018. It is now read-only.

Commit 40fd965

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request #50334 from mtanino/issue/48953
Automatic merge from submit-queue (batch tested with PRs 49849, 50334, 51414) Support iscsi volume attach and detach **What this PR does / why we need it**: Support iSCSI volume attach and detach to enforce RWO access **Which issue this PR fixes** : fixes #48953 **Special notes for your reviewer**: **Release note**: ``` NONE ```
2 parents cc34681 + ccbe7f7 commit 40fd965

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

pkg/volume/cinder/attacher.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
"time"
2525

2626
"github.com/golang/glog"
27+
"k8s.io/api/core/v1"
2728
"k8s.io/apimachinery/pkg/types"
2829
"k8s.io/apimachinery/pkg/util/wait"
2930
"k8s.io/kubernetes/pkg/cloudprovider"
@@ -220,7 +221,7 @@ func (attacher *cinderDiskAttacher) VolumesAreAttached(specs []*volume.Spec, nod
220221
return volumesAttachedCheck, nil
221222
}
222223

223-
func (attacher *cinderDiskAttacher) WaitForAttach(spec *volume.Spec, devicePath string, timeout time.Duration) (string, error) {
224+
func (attacher *cinderDiskAttacher) WaitForAttach(spec *volume.Spec, devicePath string, _ *v1.Pod, timeout time.Duration) (string, error) {
224225
// NOTE: devicePath is is path as reported by Cinder, which may be incorrect and should not be used. See Issue #33128
225226
volumeSource, _, err := getVolumeSource(spec)
226227
if err != nil {

0 commit comments

Comments
 (0)