github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 23:47:50 +00:00
Code Issues Projects Releases Wiki Activity

updated cadvisor version

Browse Source
This commit is contained in:
bindata-mockuser
2016-08-02 16:01:00 -07:00
parent fa5f3b816e
commit e00a35ccad
18 changed files with 211 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/kubelet/server/stats/summary.go
View File

@@ -125,14 +125,14 @@ func (sb *summaryBuilder) build() (*stats.Summary, error) {
AvailableBytes: &sb.rootFsInfo.Available,
CapacityBytes: &sb.rootFsInfo.Capacity,
UsedBytes: &sb.rootFsInfo.Usage,
InodesFree: &sb.rootFsInfo.InodesFree},
InodesFree: sb.rootFsInfo.InodesFree},
StartTime: rootStats.StartTime,
Runtime: &stats.RuntimeStats{
ImageFs: &stats.FsStats{
AvailableBytes: &sb.imageFsInfo.Available,
CapacityBytes: &sb.imageFsInfo.Capacity,
UsedBytes: &sb.imageStats.TotalStorageBytes,
InodesFree: &sb.imageFsInfo.InodesFree,
InodesFree: sb.imageFsInfo.InodesFree,
},
},
}
@@ -164,14 +164,14 @@ func (sb *summaryBuilder) containerInfoV2FsStats(
cs.Logs = &stats.FsStats{
AvailableBytes: &sb.rootFsInfo.Available,
CapacityBytes: &sb.rootFsInfo.Capacity,
InodesFree: &sb.rootFsInfo.InodesFree,
InodesFree: sb.rootFsInfo.InodesFree,
}
// The container rootFs lives on the imageFs devices (which may not be the node root fs)
cs.Rootfs = &stats.FsStats{
AvailableBytes: &sb.imageFsInfo.Available,
CapacityBytes: &sb.imageFsInfo.Capacity,
InodesFree: &sb.imageFsInfo.InodesFree,
InodesFree: sb.imageFsInfo.InodesFree,
}
lcs, found := sb.latestContainerStats(info)
if !found {