github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-15 14:53:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #55820 from shyamjvs/restore-resource-gatherer-pollperiod-default

Browse Source 
Automatic merge from submit-queue. 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>.

Restore default polling period of resource-gatherer

Fixes https://github.com/kubernetes/kubernetes/issues/55818

/cc @jiayingz @mindprince
This commit is contained in:
Kubernetes Submit Queue 2017-11-15 16:03:06 -08:00 committed by GitHub
commit ded83878c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -206,7 +206,7 @@ func (f *Framework) BeforeEach() {
InKubemark: ProviderIs("kubemark"), InKubemark: ProviderIs("kubemark"),
MasterOnly: TestContext.GatherKubeSystemResourceUsageData == "master", MasterOnly: TestContext.GatherKubeSystemResourceUsageData == "master",
ResourceDataGatheringPeriod: 60 * time.Second, ResourceDataGatheringPeriod: 60 * time.Second,
ProbeDuration: 5 * time.Second, ProbeDuration: 15 * time.Second,
}, nil) }, nil)
if err != nil { if err != nil {
Logf("Error while creating NewResourceUsageGatherer: %v", err) Logf("Error while creating NewResourceUsageGatherer: %v", err)