Merge pull request #45097 from shyamjvs/report-metrics-grabber-error

Automatic merge from submit-queue (batch tested with PRs 45033, 44961, 45021, 45097, 44938) Disable the kubelet part of metrics collection in kubemark Fixes https://github.com/kubernetes/kubernetes/issues/45038 This should fix it, as we are just interested in getting the apiserver metrics from kubemark master. cc @wojtek-t @gmarek

Merge pull request #45097 from shyamjvs/report-metrics-grabber-error
b5d4bbb6 · Kubernetes Submit Queue · GitHub · 01321936 · 3eba4ef9 · b5d4bbb6
Commit b5d4bbb6 authored Apr 28, 2017 by Kubernetes Submit Queue Committed by GitHub Apr 28, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

framework.go test/e2e/framework/framework.go +2 -1

No files found.
--- a/test/e2e/framework/framework.go
+++ b/test/e2e/framework/framework.go
@@ -324,8 +324,9 @@ func (f *Framework) AfterEach() {

 	if TestContext.GatherMetricsAfterTest {
 		By("Gathering metrics")
+		// Grab apiserver metrics and nodes' kubelet metrics (for non-kubemark case).
 		// TODO: enable Scheduler and ControllerManager metrics grabbing when Master's Kubelet will be registered.
-		grabber, err := metrics.NewMetricsGrabber(f.ClientSet, true, false, false, true)
+		grabber, err := metrics.NewMetricsGrabber(f.ClientSet, !ProviderIs("kubemark"), false, false, true)
 		if err != nil {
 			Logf("Failed to create MetricsGrabber (skipping metrics gathering): %v", err)
 		} else {