Merge pull request #78058 from verult/skip-leaking-pd

test/e2e/storage/testsuites/base.go

@@ -512,11 +512,12 @@ func getVolumeOpCounts(c clientset.Interface, pluginName string) opCounts {
 	metricsGrabber, err := metrics.NewMetricsGrabber(c, nil, true, false, true, false, false)
 
 	if err != nil {
-		framework.Failf("Error creating metrics grabber : %v", err)
+		framework.ExpectNoError(err, "Error creating metrics grabber: %v", err)
 	}
 
 	if !metricsGrabber.HasRegisteredMaster() {
-		framework.Skipf("Environment does not support getting controller-manager metrics - skipping")
+		e2elog.Logf("Warning: Environment does not support getting controller-manager metrics")
+		return opCounts{}
 	}
 
 	controllerMetrics, err := metricsGrabber.GrabFromControllerManager()

test/e2e/storage/testsuites/volumes.go

@@ -118,12 +118,11 @@ func (t *volumesTestSuite) defineTests(driver TestDriver, pattern testpatterns.T
 
 		// Now do the more expensive test initialization.
 		l.config, l.testCleanup = driver.PrepareTest(f)
+		l.intreeOps, l.migratedOps = getMigrationVolumeOpCounts(f.ClientSet, dInfo.InTreePluginName)
 		l.resource = createGenericVolumeTestResource(driver, l.config, pattern)
 		if l.resource.volSource == nil {
 			framework.Skipf("Driver %q does not define volumeSource - skipping", dInfo.Name)
 		}
-
-		l.intreeOps, l.migratedOps = getMigrationVolumeOpCounts(f.ClientSet, dInfo.InTreePluginName)
 	}
 
 	cleanup := func() {