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

Commit f273bd5

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request #54856 from jsafrane/fix-detacher-param-name
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Rename Detach() parameter. `Detach()` does not get device name, it gets volume name. Parameters named `deviceMountPath` or `deviceName` just confuses developers. Note that this PR just renames parameters here and there, there should be no behavior change. @kubernetes/sig-storage-pr-reviews /assign @gnufied @jingxu97 **Release note**: ```release-note NONE ```
2 parents b23fc0b + 1ccea30 commit f273bd5

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

pkg/volume/cinder/attacher.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,8 +374,8 @@ func (detacher *cinderDiskDetacher) waitDiskDetached(instanceID, volumeID string
374374
return err
375375
}
376376

377-
func (detacher *cinderDiskDetacher) Detach(deviceMountPath string, nodeName types.NodeName) error {
378-
volumeID := path.Base(deviceMountPath)
377+
func (detacher *cinderDiskDetacher) Detach(volumeName string, nodeName types.NodeName) error {
378+
volumeID := path.Base(volumeName)
379379
instances, res := detacher.cinderProvider.Instances()
380380
if !res {
381381
return fmt.Errorf("failed to list openstack instances")

0 commit comments

Comments
 (0)