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

Add image garbage collection policy to imageManager.

Browse Source
This commit is contained in:
Victor Marmol
2015-03-15 20:37:19 -07:00
parent 303a1f7ea1
commit 6bcbf12a3d
7 changed files with 304 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubelet/cadvisor/cadvisor_unsupported.go
View File

@@ -22,7 +22,7 @@ import (
"errors"
cadvisorApi "github.com/google/cadvisor/info/v1"
cadvisorApi2 "github.com/google/cadvisor/info/v2"
cadvisorApiV2 "github.com/google/cadvisor/info/v2"
)
type cadvisorUnsupported struct {
@@ -48,6 +48,6 @@ func (self *cadvisorUnsupported) MachineInfo() (*cadvisorApi.MachineInfo, error)
return nil, unsupportedErr
}
func (self *cadvisorUnsupported) DockerImagesFsInfo() (cadvisorApi2.FsInfo, error) {
return cadvisorApi2.FsInfo{}, unsupportedErr
func (self *cadvisorUnsupported) DockerImagesFsInfo() (cadvisorApiV2.FsInfo, error) {
return cadvisorApiV2.FsInfo{}, unsupportedErr
}