diff --git a/pkg/kubelet/cadvisor/cadvisor_linux.go b/pkg/kubelet/cadvisor/cadvisor_linux.go index 41729e5547d..408b0050544 100644 --- a/pkg/kubelet/cadvisor/cadvisor_linux.go +++ b/pkg/kubelet/cadvisor/cadvisor_linux.go @@ -137,19 +137,6 @@ func (cc *cadvisorClient) VersionInfo() (*cadvisorapi.VersionInfo, error) { return cc.GetVersionInfo() } -func (cc *cadvisorClient) SubcontainerInfo(name string, req *cadvisorapi.ContainerInfoRequest) (map[string]*cadvisorapi.ContainerInfo, error) { - infos, err := cc.SubcontainersInfo(name, req) - if err != nil && len(infos) == 0 { - return nil, err - } - - result := make(map[string]*cadvisorapi.ContainerInfo, len(infos)) - for _, info := range infos { - result[info.Name] = info - } - return result, err -} - func (cc *cadvisorClient) MachineInfo() (*cadvisorapi.MachineInfo, error) { return cc.GetMachineInfo() } diff --git a/pkg/kubelet/cadvisor/cadvisor_unsupported.go b/pkg/kubelet/cadvisor/cadvisor_unsupported.go index abd11f62345..bc1b32c4d00 100644 --- a/pkg/kubelet/cadvisor/cadvisor_unsupported.go +++ b/pkg/kubelet/cadvisor/cadvisor_unsupported.go @@ -51,10 +51,6 @@ func (cu *cadvisorUnsupported) GetRequestedContainersInfo(containerName string, return nil, errUnsupported } -func (cu *cadvisorUnsupported) SubcontainerInfo(name string, req *cadvisorapi.ContainerInfoRequest) (map[string]*cadvisorapi.ContainerInfo, error) { - return nil, errUnsupported -} - func (cu *cadvisorUnsupported) MachineInfo() (*cadvisorapi.MachineInfo, error) { return nil, errUnsupported } diff --git a/pkg/kubelet/cadvisor/cadvisor_windows.go b/pkg/kubelet/cadvisor/cadvisor_windows.go index 5cbedcfe3a1..407066996d5 100644 --- a/pkg/kubelet/cadvisor/cadvisor_windows.go +++ b/pkg/kubelet/cadvisor/cadvisor_windows.go @@ -55,10 +55,6 @@ func (cu *cadvisorClient) GetRequestedContainersInfo(containerName string, optio return nil, nil } -func (cu *cadvisorClient) SubcontainerInfo(name string, req *cadvisorapi.ContainerInfoRequest) (map[string]*cadvisorapi.ContainerInfo, error) { - return nil, nil -} - func (cu *cadvisorClient) MachineInfo() (*cadvisorapi.MachineInfo, error) { return cu.winStatsClient.WinMachineInfo() } diff --git a/pkg/kubelet/cadvisor/testing/cadvisor_fake.go b/pkg/kubelet/cadvisor/testing/cadvisor_fake.go index 925682fd86b..108058d5f1f 100644 --- a/pkg/kubelet/cadvisor/testing/cadvisor_fake.go +++ b/pkg/kubelet/cadvisor/testing/cadvisor_fake.go @@ -56,11 +56,6 @@ func (c *Fake) GetRequestedContainersInfo(containerName string, options cadvisor return map[string]*cadvisorapi.ContainerInfo{}, nil } -// SubcontainerInfo is a fake implementation of Interface.SubcontainerInfo. -func (c *Fake) SubcontainerInfo(name string, req *cadvisorapi.ContainerInfoRequest) (map[string]*cadvisorapi.ContainerInfo, error) { - return map[string]*cadvisorapi.ContainerInfo{}, nil -} - // MachineInfo is a fake implementation of Interface.MachineInfo. func (c *Fake) MachineInfo() (*cadvisorapi.MachineInfo, error) { // Simulate a machine with 1 core and 3.75GB of memory. diff --git a/pkg/kubelet/cadvisor/testing/cadvisor_mock.go b/pkg/kubelet/cadvisor/testing/cadvisor_mock.go index ce35a228201..0f55fe34e9e 100644 --- a/pkg/kubelet/cadvisor/testing/cadvisor_mock.go +++ b/pkg/kubelet/cadvisor/testing/cadvisor_mock.go @@ -171,21 +171,6 @@ func (mr *MockInterfaceMockRecorder) Start() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Start", reflect.TypeOf((*MockInterface)(nil).Start)) } -// SubcontainerInfo mocks base method. -func (m *MockInterface) SubcontainerInfo(name string, req *v1.ContainerInfoRequest) (map[string]*v1.ContainerInfo, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SubcontainerInfo", name, req) - ret0, _ := ret[0].(map[string]*v1.ContainerInfo) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// SubcontainerInfo indicates an expected call of SubcontainerInfo. -func (mr *MockInterfaceMockRecorder) SubcontainerInfo(name, req interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubcontainerInfo", reflect.TypeOf((*MockInterface)(nil).SubcontainerInfo), name, req) -} - // VersionInfo mocks base method. func (m *MockInterface) VersionInfo() (*v1.VersionInfo, error) { m.ctrl.T.Helper() diff --git a/pkg/kubelet/cadvisor/types.go b/pkg/kubelet/cadvisor/types.go index 153ca8c01a6..d9fced40ef4 100644 --- a/pkg/kubelet/cadvisor/types.go +++ b/pkg/kubelet/cadvisor/types.go @@ -28,7 +28,6 @@ type Interface interface { Start() error ContainerInfoV2(name string, options cadvisorapiv2.RequestOptions) (map[string]cadvisorapiv2.ContainerInfo, error) GetRequestedContainersInfo(containerName string, options cadvisorapiv2.RequestOptions) (map[string]*cadvisorapi.ContainerInfo, error) - SubcontainerInfo(name string, req *cadvisorapi.ContainerInfoRequest) (map[string]*cadvisorapi.ContainerInfo, error) MachineInfo() (*cadvisorapi.MachineInfo, error) VersionInfo() (*cadvisorapi.VersionInfo, error)