mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-01 07:47:56 +00:00
CSI migration e2e: do not skip tests if metricsGrabber.HasRegisteredMaster() is true
This commit is contained in:
parent
63e6cf3a0a
commit
eead54985d
@ -512,11 +512,12 @@ func getVolumeOpCounts(c clientset.Interface, pluginName string) opCounts {
|
|||||||
metricsGrabber, err := metrics.NewMetricsGrabber(c, nil, true, false, true, false, false)
|
metricsGrabber, err := metrics.NewMetricsGrabber(c, nil, true, false, true, false, false)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
framework.Failf("Error creating metrics grabber : %v", err)
|
framework.ExpectNoError(err, "Error creating metrics grabber: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if !metricsGrabber.HasRegisteredMaster() {
|
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()
|
controllerMetrics, err := metricsGrabber.GrabFromControllerManager()
|
||||||
|
@ -118,12 +118,11 @@ func (t *volumesTestSuite) defineTests(driver TestDriver, pattern testpatterns.T
|
|||||||
|
|
||||||
// Now do the more expensive test initialization.
|
// Now do the more expensive test initialization.
|
||||||
l.config, l.testCleanup = driver.PrepareTest(f)
|
l.config, l.testCleanup = driver.PrepareTest(f)
|
||||||
|
l.intreeOps, l.migratedOps = getMigrationVolumeOpCounts(f.ClientSet, dInfo.InTreePluginName)
|
||||||
l.resource = createGenericVolumeTestResource(driver, l.config, pattern)
|
l.resource = createGenericVolumeTestResource(driver, l.config, pattern)
|
||||||
if l.resource.volSource == nil {
|
if l.resource.volSource == nil {
|
||||||
framework.Skipf("Driver %q does not define volumeSource - skipping", dInfo.Name)
|
framework.Skipf("Driver %q does not define volumeSource - skipping", dInfo.Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
l.intreeOps, l.migratedOps = getMigrationVolumeOpCounts(f.ClientSet, dInfo.InTreePluginName)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
cleanup := func() {
|
cleanup := func() {
|
||||||
|
Loading…
Reference in New Issue
Block a user