github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use cAdvisor constant for crio imagefs

Browse Source
This commit is contained in:
Derek Carr 2017-09-11 14:08:00 -04:00
parent db809c0eb7
commit cf2c688385
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubelet/cadvisor/helpers_linux.go
View File

@ -40,9 +40,8 @@ func (i *imageFsInfoProvider) ImageFsInfoLabel() (string, error) {
case "rkt": case "rkt":
return cadvisorfs.LabelRktImages, nil return cadvisorfs.LabelRktImages, nil
case "remote": case "remote":
// TODO: pending rebase including https://github.com/google/cadvisor/pull/1741
if i.runtimeEndpoint == "/var/run/crio.sock" { if i.runtimeEndpoint == "/var/run/crio.sock" {
return "crio-images", nil return cadvisorfs.LabelCrioImages, nil
} }
} }
return "", fmt.Errorf("no imagefs label for configured runtime") return "", fmt.Errorf("no imagefs label for configured runtime")