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

Merge pull request #33778 from timstclair/summary-arm 

Automatic merge from submit-queue

Fix summary_test.go ARM build

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

/cc @ixdy @luxas
pull/6/head
Kubernetes Submit Queue 2016-09-29 22:22:03 -07:00 committed by GitHub
parent 8f918d361b e2b7424ee0
commit 186a4a06c6
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_node/summary_test.go
View File

@ -46,10 +46,10 @@ var _ = framework.KubeDescribe("Summary API [Flaky]", func() {
// Setup expectations.
const (
kb = 1000
mb = 1000 * kb
gb = 1000 * mb
tb = 1000 * gb
kb int64 = 1000
mb int64 = 1000 * kb
gb int64 = 1000 * mb
tb int64 = 1000 * gb
maxStartAge = time.Hour * 24 * 365 // 1 year
maxStatsAge = time.Minute