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

kubelet/cadvisor: Refactor cadvisor disk stat/usage interfaces

Browse Source
This commit is contained in:
Shaya Potter
2016-05-17 22:05:55 -07:00
parent f3ab7b182f
commit ae08ef38d7
22 changed files with 76 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/mesos/pkg/executor/service/cadvisor.go
View File

@@ -28,8 +28,8 @@ type MesosCadvisor struct {
mem uint64
}
func NewMesosCadvisor(cores int, mem uint64, port uint) (*MesosCadvisor, error) {
c, err := cadvisor.New(port)
func NewMesosCadvisor(cores int, mem uint64, port uint, runtime string) (*MesosCadvisor, error) {
c, err := cadvisor.New(port, runtime)
if err != nil {
return nil, err
}

2
contrib/mesos/pkg/executor/service/service.go
View File

@@ -209,7 +209,7 @@ func (s *KubeletExecutorServer) runKubelet(
// create custom cAdvisor interface which return the resource values that Mesos reports
ni := <-nodeInfos
cAdvisorInterface, err := NewMesosCadvisor(ni.Cores, ni.Mem, s.CAdvisorPort)
cAdvisorInterface, err := NewMesosCadvisor(ni.Cores, ni.Mem, s.CAdvisorPort, kcfg.ContainerRuntime)
if err != nil {
return err
}