Merge pull request #93120 from msau42/e2e-export

Export WaitForCSIDriverRegistrationOnAllNodes
This commit is contained in:
Kubernetes Prow Robot 2020-08-28 06:34:53 -07:00 committed by GitHub
commit f6d169c7ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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