github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Allow kubelet metrics tests to run on gke

pull/6/head
Michelle Au 2017-09-26 10:00:12 -07:00
parent b188868fd9
commit 27eab0c97f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/storage/volume_metrics.go
View File

@ -62,10 +62,6 @@ var _ = SIGDescribe("[Serial] Volume metrics", func() {
if err != nil { if err != nil {
framework.Failf("Error creating metrics grabber : %v", err) framework.Failf("Error creating metrics grabber : %v", err)
} }
if !metricsGrabber.HasRegisteredMaster() {
framework.Skipf("Environment does not support getting controller-manager metrics - skipping")
}
}) })
AfterEach(func() { AfterEach(func() {
@ -75,6 +71,10 @@ var _ = SIGDescribe("[Serial] Volume metrics", func() {
It("should create prometheus metrics for volume provisioning and attach/detach", func() { It("should create prometheus metrics for volume provisioning and attach/detach", func() {
var err error var err error
if !metricsGrabber.HasRegisteredMaster() {
framework.Skipf("Environment does not support getting controller-manager metrics - skipping")
}
controllerMetrics, err := metricsGrabber.GrabFromControllerManager() controllerMetrics, err := metricsGrabber.GrabFromControllerManager()
Expect(err).NotTo(HaveOccurred(), "Error getting c-m metrics : %v", err) Expect(err).NotTo(HaveOccurred(), "Error getting c-m metrics : %v", err)