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

Merge pull request #624 from dchen1107/cadvisor

Browse Source 
update cadvisor client package which includes my fix for #608
This commit is contained in:
Daniel Smith
2014-07-25 13:12:52 -07:00
parent 25150947c8 c48f6dcb34
commit 6b5690a259
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
third_party/src/github.com/google/cadvisor/client/client.go vendored
View File

@@ -36,10 +36,6 @@ func NewClient(URL string) (*Client, error) {
"api/v1.0", "api/v1.0",
}, "/"), }, "/"),
} }
_, err := c.MachineInfo()
if err != nil {
return nil, err
}
return c, nil return c, nil
} }

2
third_party/src/github.com/google/cadvisor/client/client_test.go vendored
View File

@@ -96,7 +96,7 @@ func TestGetContainerInfo(t *testing.T) {
NumStats: 3, NumStats: 3,
NumSamples: 2, NumSamples: 2,
CpuUsagePercentiles: []int{10, 50, 90}, CpuUsagePercentiles: []int{10, 50, 90},
MemoryUsagePercentages: []int{10, 80, 90}, MemoryUsagePercentiles: []int{10, 80, 90},
} }
containerName := "/some/container" containerName := "/some/container"
cinfo := itest.GenerateRandomContainerInfo(containerName, 4, query, 1*time.Second) cinfo := itest.GenerateRandomContainerInfo(containerName, 4, query, 1*time.Second)