github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 18:24:07 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Kubernetes Submit Queue 2017-04-28 13:16:45 -07:00 committed by GitHub
commit b5d4bbb6c6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e/framework/framework.go
View File

@ -324,8 +324,9 @@ func (f *Framework) AfterEach() {
if TestContext.GatherMetricsAfterTest { if TestContext.GatherMetricsAfterTest {
By("Gathering metrics") 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. // 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 { if err != nil {
Logf("Failed to create MetricsGrabber (skipping metrics gathering): %v", err) Logf("Failed to create MetricsGrabber (skipping metrics gathering): %v", err)
} else { } else {