scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #43083 from alejandroEsc/ae/osx/e2e_node_problem_detector

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 43378, 43216, 43384, 43083, 43428)

Darwin won't build: syscall.Sysinfo issue.

**What this PR does / why we need it**: On darwin had problems building and testing because of syscall.Sysinfo_t etc which is a linux specific command. 

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*:

**Special notes for your reviewer**: Definitely would like another set of eyes on the bootTime function, it will have to be inaccurate but open to suggestions about improving this for darwin.


**Release note**:
```
NONE
```
This commit is contained in:
Kubernetes Submit Queue
2017-03-25 21:22:26 -07:00
committed by GitHub
parent 2209503a0f ee741f23af
commit 0afb06b600
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e_node/BUILD
View File

@@ -16,7 +16,7 @@ go_library(
"doc.go", "doc.go",
"gpus.go", "gpus.go",
"image_list.go", "image_list.go",
"node_problem_detector.go", "node_problem_detector_linux.go",
"resource_collector.go", "resource_collector.go",
"simple_mount.go", "simple_mount.go",
"util.go", "util.go",

2
test/e2e_node/node_problem_detector.go → test/e2e_node/node_problem_detector_linux.go
View File

@@ -1,3 +1,5 @@
// +build cgo,linux
/* /*
Copyright 2016 The Kubernetes Authors. Copyright 2016 The Kubernetes Authors.