From 27eab0c97ffafbda686cfe4f7a866308aef48217 Mon Sep 17 00:00:00 2001 From: Michelle Au Date: Tue, 26 Sep 2017 10:00:12 -0700 Subject: [PATCH] Allow kubelet metrics tests to run on gke --- test/e2e/storage/volume_metrics.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/e2e/storage/volume_metrics.go b/test/e2e/storage/volume_metrics.go index de80ed8b0f..a2e3f37a80 100644 --- a/test/e2e/storage/volume_metrics.go +++ b/test/e2e/storage/volume_metrics.go @@ -62,10 +62,6 @@ var _ = SIGDescribe("[Serial] Volume metrics", func() { if err != nil { framework.Failf("Error creating metrics grabber : %v", err) } - - if !metricsGrabber.HasRegisteredMaster() { - framework.Skipf("Environment does not support getting controller-manager metrics - skipping") - } }) AfterEach(func() { @@ -75,6 +71,10 @@ var _ = SIGDescribe("[Serial] Volume metrics", func() { It("should create prometheus metrics for volume provisioning and attach/detach", func() { var err error + if !metricsGrabber.HasRegisteredMaster() { + framework.Skipf("Environment does not support getting controller-manager metrics - skipping") + } + controllerMetrics, err := metricsGrabber.GrabFromControllerManager() Expect(err).NotTo(HaveOccurred(), "Error getting c-m metrics : %v", err)