From bd42e728a849a00225b15cc3650bad729f0a40d0 Mon Sep 17 00:00:00 2001
From: Matthew Wong <mattwon@amazon.com>
Date: Fri, 2 Aug 2019 18:08:18 -0700
Subject: [PATCH] Return error returned by CSINode Get if initialization failed

---
 pkg/volume/csi/nodeinfomanager/nodeinfomanager.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkg/volume/csi/nodeinfomanager/nodeinfomanager.go b/pkg/volume/csi/nodeinfomanager/nodeinfomanager.go
index ac3a42fe4b3..2ef1da6d9ed 100644
--- a/pkg/volume/csi/nodeinfomanager/nodeinfomanager.go
+++ b/pkg/volume/csi/nodeinfomanager/nodeinfomanager.go
@@ -417,6 +417,8 @@ func (nim *nodeInfoManager) tryInitializeCSINodeWithAnnotation(csiKubeClient cli
 		// CreateCSINode will set the annotation
 		_, err = nim.CreateCSINode()
 		return err
+	} else if err != nil {
+		return err
 	}
 
 	annotationModified := setMigrationAnnotation(nim.migratedPlugins, nodeInfo)