From 580f3bc2f9c99dde32dedc7d8bd1cd6f040c2f57 Mon Sep 17 00:00:00 2001
From: Charlie Voiselle <464492+angrycub@users.noreply.github.com>
Date: Sat, 18 Apr 2020 18:20:07 -0400
Subject: [PATCH 1/2] Use ExternalID in NodeStageVolume RPC

---
 client/pluginmanager/csimanager/volume.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/pluginmanager/csimanager/volume.go b/client/pluginmanager/csimanager/volume.go
index 10c39fa8d279..e2ddc1385df7 100644
--- a/client/pluginmanager/csimanager/volume.go
+++ b/client/pluginmanager/csimanager/volume.go
@@ -166,7 +166,7 @@ func (v *volumeManager) stageVolume(ctx context.Context, vol *structs.CSIVolume,
 	// CSI NodeStageVolume errors for timeout, codes.Unavailable and
 	// codes.ResourceExhausted are retried; all other errors are fatal.
 	return v.plugin.NodeStageVolume(ctx,
-		vol.ID,
+		vol.ExternalID,
 		publishContext,
 		pluginStagingPath,
 		capability,

From ef1fd4a74684213ae432a7aa10d9acc9e97d7724 Mon Sep 17 00:00:00 2001
From: Charlie Voiselle <464492+angrycub@users.noreply.github.com>
Date: Mon, 20 Apr 2020 13:19:53 -0400
Subject: [PATCH 2/2] Switch to vol.RemoteID()

---
 client/pluginmanager/csimanager/volume.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/pluginmanager/csimanager/volume.go b/client/pluginmanager/csimanager/volume.go
index e2ddc1385df7..3012b5362293 100644
--- a/client/pluginmanager/csimanager/volume.go
+++ b/client/pluginmanager/csimanager/volume.go
@@ -166,7 +166,7 @@ func (v *volumeManager) stageVolume(ctx context.Context, vol *structs.CSIVolume,
 	// CSI NodeStageVolume errors for timeout, codes.Unavailable and
 	// codes.ResourceExhausted are retried; all other errors are fatal.
 	return v.plugin.NodeStageVolume(ctx,
-		vol.ExternalID,
+		vol.RemoteID(),
 		publishContext,
 		pluginStagingPath,
 		capability,