gistfile1.txt

diff --git a/vendor/k8s.io/kubernetes/pkg/volume/csi/csi_block_test.go b/vendor/k8s.io/kubernetes/pkg/volume/csi/csi_block_test.go
index a63988c2d5..d0377cd30a 100644
--- a/vendor/k8s.io/kubernetes/pkg/volume/csi/csi_block_test.go
+++ b/vendor/k8s.io/kubernetes/pkg/volume/csi/csi_block_test.go
@@ -358,9 +358,7 @@ func TestBlockMapperMapDevice(t *testing.T) {
 func TestBlockMapperMapDeviceNotSupportAttach(t *testing.T) {
 	defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.CSIBlockVolume, true)()
 	defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.CSIDriverRegistry, true)()
-	plug, tmpDir := newTestPlugin(t, nil)
-	defer os.RemoveAll(tmpDir)
-	fakeClient := fakeclient.NewSimpleClientset()
+
 	attachRequired := false
 	fakeDriver := &v1beta1.CSIDriver{
 		ObjectMeta: meta.ObjectMeta{
@@ -370,17 +368,22 @@ func TestBlockMapperMapDeviceNotSupportAttach(t *testing.T) {
 			AttachRequired: &attachRequired,
 		},
 	}
-	_, err := plug.host.GetKubeClient().StorageV1beta1().CSIDrivers().Create(fakeDriver)
+
+	fakeClient := fakeclient.NewSimpleClientset()
+	_, err := fakeClient.StorageV1beta1().CSIDrivers().Create(fakeDriver)
 	if err != nil {
 		t.Fatalf("Failed to create a fakeDriver: %v", err)
 	}
 
+	plug, tmpDir := newTestPlugin(t, fakeClient)
+	defer os.RemoveAll(tmpDir)
+
 	host := volumetest.NewFakeVolumeHostWithCSINodeName(
 		tmpDir,
 		fakeClient,
 		nil,
 		"fakeNode",
-		nil,
+		plug.csiDriverLister,
 	)
 	plug.host = host
 	csiMapper, _, _, err := prepareBlockMapperTest(plug, "test-pv", t)
@@ -388,6 +391,7 @@ func TestBlockMapperMapDeviceNotSupportAttach(t *testing.T) {
 		t.Fatalf("Failed to make a new Mapper: %v", err)
 	}
 	csiMapper.csiClient = setupClient(t, true)
+
 	devicePath, err := csiMapper.SetUpDevice()
 	if err != nil {
 		t.Fatalf("mapper failed to SetupDevice: %v", err)