Merge pull request #42443 from Random-Liu/fix-node-e2e-npd

Automatic merge from submit-queue (batch tested with PRs 42443, 38924, 42367, 42391, 42310) Cast system uptime to time.Duration to fix cross build. Fixes https://github.com/kubernetes/kubernetes/issues/42441. Cast system uptime to `time.Duration` to avoid different behavior on different architectures. @sjenning @ixdy @ncdc

Merge pull request #42443 from Random-Liu/fix-node-e2e-npd
67500b39 · Kubernetes Submit Queue · GitHub · f7c07a12 · d41c2503 · 67500b39
Commit 67500b39 authored Mar 03, 2017 by Kubernetes Submit Queue Committed by GitHub Mar 03, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

node_problem_detector.go test/e2e_node/node_problem_detector.go +1 -1

No files found.
--- a/test/e2e_node/node_problem_detector.go
+++ b/test/e2e_node/node_problem_detector.go
@@ -392,7 +392,7 @@ func getNodeTime() (time.Time, time.Time, error) {
 	// Get node boot time. NOTE that because we get node current time before uptime, the boot time
 	// calculated will be a little earlier than the real boot time. This won't affect the correctness
 	// of the test result.
-	bootTime := nodeTime.Add(-time.Duration(info.Uptime * int64(time.Second)))
+	bootTime := nodeTime.Add(-time.Duration(info.Uptime) * time.Second)

 	return nodeTime, bootTime, nil
 }