github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Kubernetes Submit Queue 2017-03-03 18:08:38 -08:00 committed by GitHub
commit 67500b3947
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_node/node_problem_detector.go
View File

@ -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 // 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 // calculated will be a little earlier than the real boot time. This won't affect the correctness
// of the test result. // 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 return nodeTime, bootTime, nil
} }