Merge pull request #55868 from shyamjvs/kubemark-resource-gatherer-fix

Automatic merge from submit-queue (batch tested with PRs 55868, 55393, 55152, 55849). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Set resource-gathering and probe-duration period for kubemark Ref https://github.com/kubernetes/kubernetes/issues/55818#issuecomment-344888480 /cc @porridge fyi - @jiayingz

Merge pull request #55868 from shyamjvs/kubemark-resource-gatherer-fix
ff5cea4b · Kubernetes Submit Queue · GitHub · fbcb199f · 1ae56bbe · ff5cea4b
Unverified Commit ff5cea4b authored Nov 16, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 16, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

resource_usage_gatherer.go test/e2e/framework/resource_usage_gatherer.go +6 -4

No files found.
--- a/test/e2e/framework/resource_usage_gatherer.go
+++ b/test/e2e/framework/resource_usage_gatherer.go
@@ -215,10 +215,12 @@ func NewResourceUsageGatherer(c clientset.Interface, options ResourceGathererOpt
 	if options.InKubemark {
 		g.workerWg.Add(1)
 		g.workers = append(g.workers, resourceGatherWorker{
-			inKubemark: true,
-			stopCh:     g.stopCh,
-			wg:         &g.workerWg,
-			finished:   false,
+			inKubemark:                  true,
+			stopCh:                      g.stopCh,
+			wg:                          &g.workerWg,
+			finished:                    false,
+			resourceDataGatheringPeriod: options.ResourceDataGatheringPeriod,
+			probeDuration:               options.ProbeDuration,
 		})
 	} else {
 		// Tracks kube-system pods if no valid PodList is passed in.