Skip to content
This repository was archived by the owner on Feb 8, 2021. It is now read-only.

Commit f1f7a97

Browse files
author
harry
authored
Merge pull request #112 from heartlock/getfsinfo
support getFsInfo()
2 parents 7763e39 + 0f390bf commit f1f7a97

File tree

12 files changed

+167
-538
lines changed

12 files changed

+167
-538
lines changed

‎Godeps/Godeps.json‎

Lines changed: 66 additions & 66 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/kubelet/cadvisor/cadvisor_linux.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,7 @@ func (cc *cadvisorClient) ImagesFsInfo() (cadvisorapiv2.FsInfo, error) {
185185
case "rkt":
186186
label = cadvisorfs.LabelRktImages
187187
case "hyper":
188-
// TODO(harryz) ImageFsInfo is not working in hyper runtime
189-
return cadvisorapiv2.FsInfo{}, nil
188+
label = cadvisorfs.LabelHyperImages
190189
default:
191190
return cadvisorapiv2.FsInfo{}, fmt.Errorf("ImagesFsInfo: unknown runtime: %v", cc.runtime)
192191
}

‎vendor/github.com/google/cadvisor/.gitignore‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎vendor/github.com/google/cadvisor/build/boilerplate/boilerplate.go.txt‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎vendor/github.com/google/cadvisor/build/boilerplate/boilerplate.py.txt‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎vendor/github.com/google/cadvisor/build/boilerplate/boilerplate.sh.txt‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎vendor/github.com/google/cadvisor/container/hyper/factory.go‎

Lines changed: 19 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/google/cadvisor/fs/fs.go‎

Lines changed: 61 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/google/cadvisor/integration/runner/retrywhitelist.txt‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎vendor/github.com/google/cadvisor/manager/manager.go‎

Lines changed: 20 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)