From dd4b21e1378f7a7ca5157dd7895f3feaaaba2b1a Mon Sep 17 00:00:00 2001
From: Cheng Pan <chengpan@amazon.com>
Date: Wed, 6 Nov 2019 05:43:12 +0000
Subject: [PATCH] Fix migration tranlation library for ebs

---
 staging/src/k8s.io/csi-translation-lib/plugins/aws_ebs.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/staging/src/k8s.io/csi-translation-lib/plugins/aws_ebs.go b/staging/src/k8s.io/csi-translation-lib/plugins/aws_ebs.go
index e058a0161d4..03eee92ad18 100644
--- a/staging/src/k8s.io/csi-translation-lib/plugins/aws_ebs.go
+++ b/staging/src/k8s.io/csi-translation-lib/plugins/aws_ebs.go
@@ -57,6 +57,10 @@ func (t *awsElasticBlockStoreCSITranslator) TranslateInTreeInlineVolumeToCSI(vol
 		return nil, fmt.Errorf("volume is nil or AWS EBS not defined on volume")
 	}
 	ebsSource := volume.AWSElasticBlockStore
+	volumeHandle, err := KubernetesVolumeIDToEBSVolumeID(ebsSource.VolumeID)
+	if err != nil {
+		return nil, fmt.Errorf("failed to translate Kubernetes ID to EBS Volume ID %v", err)
+	}
 	pv := &v1.PersistentVolume{
 		ObjectMeta: metav1.ObjectMeta{
 			// A.K.A InnerVolumeSpecName required to match for Unmount
@@ -66,7 +70,7 @@ func (t *awsElasticBlockStoreCSITranslator) TranslateInTreeInlineVolumeToCSI(vol
 			PersistentVolumeSource: v1.PersistentVolumeSource{
 				CSI: &v1.CSIPersistentVolumeSource{
 					Driver:       AWSEBSDriverName,
-					VolumeHandle: ebsSource.VolumeID,
+					VolumeHandle: volumeHandle,
 					ReadOnly:     ebsSource.ReadOnly,
 					FSType:       ebsSource.FSType,
 					VolumeAttributes: map[string]string{