github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Kubelet: do not report used inodes on Windows

pull/8/head
Pengfei Ni 2018-09-03 15:16:35 +08:00
parent e1fdaa177f
commit 8255318b96
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/kubelet/dockershim/docker_image_windows.go
View File

@ -47,7 +47,6 @@ func (ds *dockerService) ImageFsInfo(_ context.Context, _ *runtimeapi.ImageFsInf
{ {
Timestamp: time.Now().UnixNano(), Timestamp: time.Now().UnixNano(),
UsedBytes: &runtimeapi.UInt64Value{Value: fsinfo.Usage}, UsedBytes: &runtimeapi.UInt64Value{Value: fsinfo.Usage},
InodesUsed: &runtimeapi.UInt64Value{Value: 0},
FsId: &runtimeapi.FilesystemIdentifier{ FsId: &runtimeapi.FilesystemIdentifier{
Mountpoint: info.DockerRootDir, Mountpoint: info.DockerRootDir,
}, },

4
pkg/kubelet/stats/cri_stats_provider.go
View File

@ -184,7 +184,9 @@ func (p *criStatsProvider) ImageFsStats() (*statsapi.FsStats, error) {
s := &statsapi.FsStats{ s := &statsapi.FsStats{
Time: metav1.NewTime(time.Unix(0, fs.Timestamp)), Time: metav1.NewTime(time.Unix(0, fs.Timestamp)),
UsedBytes: &fs.UsedBytes.Value, UsedBytes: &fs.UsedBytes.Value,
InodesUsed: &fs.InodesUsed.Value, }
if fs.InodesUsed != nil {
s.InodesUsed = &fs.InodesUsed.Value
} }
imageFsInfo := p.getFsInfo(fs.GetFsId()) imageFsInfo := p.getFsInfo(fs.GetFsId())
if imageFsInfo != nil { if imageFsInfo != nil {