Update the entire cAdvisor package. There is a version mismatch issue

which cause #707
This commit is contained in:
Dawn Chen
2014-07-30 16:56:50 -07:00
parent 76ec7acf91
commit 2e8020be8c
3 changed files with 19 additions and 17 deletions

View File

@@ -289,7 +289,7 @@ func (kl *Kubelet) runContainer(pod *Pod, container *api.Container, podVolumes v
ExposedPorts: exposedPorts,
Hostname: container.Name,
Image: container.Image,
Memory: uint64(container.Memory),
Memory: int64(container.Memory),
CpuShares: int64(milliCPUToShares(container.CPU)),
Volumes: volumes,
WorkingDir: container.WorkingDir,
@@ -545,7 +545,7 @@ func getCadvisorContainerInfoRequest(req *info.ContainerInfoRequest) *info.Conta
ret := &info.ContainerInfoRequest{
NumStats: req.NumStats,
CpuUsagePercentiles: req.CpuUsagePercentiles,
MemoryUsagePercentages: req.MemoryUsagePercentages,
MemoryUsagePercentiles: req.MemoryUsagePercentiles,
}
return ret
}