From 10a8c195a181f67e6e144f78aa5b2e79e4c90f94 Mon Sep 17 00:00:00 2001 From: Michelle Au Date: Wed, 15 Jul 2020 15:00:18 -0700 Subject: [PATCH] Export WaitForCSIDriverRegistrationOnAllNodes to be used by external csi driver repos Change-Id: Ie61430b1050a778d8ba98177e0c995ff2553f9cd --- test/e2e/storage/drivers/csi.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/e2e/storage/drivers/csi.go b/test/e2e/storage/drivers/csi.go index 88b9ef7a888..b34cdf13e71 100644 --- a/test/e2e/storage/drivers/csi.go +++ b/test/e2e/storage/drivers/csi.go @@ -567,7 +567,7 @@ func (g *gcePDCSIDriver) PrepareTest(f *framework.Framework) (*testsuites.PerTes framework.Failf("deploying csi gce-pd driver: %v", err) } - if err = waitForCSIDriverRegistrationOnAllNodes(GCEPDCSIDriverName, f.ClientSet); err != nil { + if err = WaitForCSIDriverRegistrationOnAllNodes(GCEPDCSIDriverName, f.ClientSet); err != nil { framework.Failf("waiting for csi driver node registration on: %v", err) } @@ -602,7 +602,9 @@ func (g *gcePDCSIDriver) PrepareTest(f *framework.Framework) (*testsuites.PerTes }, cleanupFunc } -func waitForCSIDriverRegistrationOnAllNodes(driverName string, cs clientset.Interface) error { +// WaitForCSIDriverRegistrationOnAllNodes waits for the CSINode object to be updated +// with the given driver on all schedulable nodes. +func WaitForCSIDriverRegistrationOnAllNodes(driverName string, cs clientset.Interface) error { nodes, err := e2enode.GetReadySchedulableNodes(cs) if err != nil { return err