Merge pull request #68635 from mkimuram/issue/68424

CSI block volume refactor to fix target path

Merge pull request #68635 from mkimuram/issue/68424
cde4c9eb · k8s-ci-robot · GitHub · 8797db33 · 9c56b533 · cde4c9eb
Unverified Commit cde4c9eb authored Nov 15, 2018 by k8s-ci-robot Committed by GitHub Nov 15, 2018
Showing with 1 addition and 1 deletion

csi_block.go pkg/volume/csi/csi_block.go +0 -0

csi_block_test.go pkg/volume/csi/csi_block_test.go +0 -0

operation_generator.go pkg/volume/util/operationexecutor/operation_generator.go +1 -1

No files found.
--- a/pkg/volume/csi/csi_block.go
+++ b/pkg/volume/csi/csi_block.go
--- a/pkg/volume/csi/csi_block_test.go
+++ b/pkg/volume/csi/csi_block_test.go
--- a/pkg/volume/util/operationexecutor/operation_generator.go
+++ b/pkg/volume/util/operationexecutor/operation_generator.go
@@ -1045,7 +1045,7 @@ func (og *operationGenerator) GenerateUnmapDeviceFunc(
 	}

 	blockVolumeUnmapper, newUnmapperErr := blockVolumePlugin.NewBlockVolumeUnmapper(
-		string(deviceToDetach.VolumeName),
+		deviceToDetach.VolumeSpec.Name(),
 		"" /* podUID */)
 	if newUnmapperErr != nil {
 		return volumetypes.GeneratedOperations{}, deviceToDetach.GenerateErrorDetailed("UnmapDevice.NewUnmapper failed", newUnmapperErr)