From c865ad532a4e56730dfddaedcf830efd4423d432 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Fri, 15 Dec 2023 10:25:05 -0800 Subject: [PATCH] fixing based on feedback in PR Signed-off-by: Davanum Srinivas --- pkg/kubelet/cadvisor/cadvisor_linux.go | 4 ---- pkg/kubelet/cadvisor/cadvisor_unsupported.go | 4 ---- pkg/kubelet/cadvisor/cadvisor_windows.go | 4 ---- pkg/kubelet/cadvisor/testing/cadvisor_fake.go | 5 ----- pkg/kubelet/cadvisor/testing/cadvisor_mock.go | 15 --------------- pkg/kubelet/cadvisor/types.go | 1 - 6 files changed, 33 deletions(-) diff --git a/pkg/kubelet/cadvisor/cadvisor_linux.go b/pkg/kubelet/cadvisor/cadvisor_linux.go index f4857f7cb08..41729e5547d 100644 --- a/pkg/kubelet/cadvisor/cadvisor_linux.go +++ b/pkg/kubelet/cadvisor/cadvisor_linux.go @@ -129,10 +129,6 @@ func (cc *cadvisorClient) Start() error { return cc.Manager.Start() } -func (cc *cadvisorClient) ContainerInfo(name string, req *cadvisorapi.ContainerInfoRequest) (*cadvisorapi.ContainerInfo, error) { - return cc.GetContainerInfo(name, req) -} - func (cc *cadvisorClient) ContainerInfoV2(name string, options cadvisorapiv2.RequestOptions) (map[string]cadvisorapiv2.ContainerInfo, error) { return cc.GetContainerInfoV2(name, options) } diff --git a/pkg/kubelet/cadvisor/cadvisor_unsupported.go b/pkg/kubelet/cadvisor/cadvisor_unsupported.go index 31674c89c2a..abd11f62345 100644 --- a/pkg/kubelet/cadvisor/cadvisor_unsupported.go +++ b/pkg/kubelet/cadvisor/cadvisor_unsupported.go @@ -43,10 +43,6 @@ func (cu *cadvisorUnsupported) Start() error { return errUnsupported } -func (cu *cadvisorUnsupported) ContainerInfo(name string, req *cadvisorapi.ContainerInfoRequest) (*cadvisorapi.ContainerInfo, error) { - return nil, errUnsupported -} - func (cu *cadvisorUnsupported) ContainerInfoV2(name string, options cadvisorapiv2.RequestOptions) (map[string]cadvisorapiv2.ContainerInfo, error) { return nil, errUnsupported } diff --git a/pkg/kubelet/cadvisor/cadvisor_windows.go b/pkg/kubelet/cadvisor/cadvisor_windows.go index 047f85c43be..5cbedcfe3a1 100644 --- a/pkg/kubelet/cadvisor/cadvisor_windows.go +++ b/pkg/kubelet/cadvisor/cadvisor_windows.go @@ -46,10 +46,6 @@ func (cu *cadvisorClient) Start() error { return nil } -func (cu *cadvisorClient) ContainerInfo(name string, req *cadvisorapi.ContainerInfoRequest) (*cadvisorapi.ContainerInfo, error) { - return &cadvisorapi.ContainerInfo{}, nil -} - // ContainerInfoV2 is only expected to be used for the root container. Returns info for all containers in the node. func (cu *cadvisorClient) ContainerInfoV2(name string, options cadvisorapiv2.RequestOptions) (map[string]cadvisorapiv2.ContainerInfo, error) { return cu.winStatsClient.WinContainerInfos() diff --git a/pkg/kubelet/cadvisor/testing/cadvisor_fake.go b/pkg/kubelet/cadvisor/testing/cadvisor_fake.go index a67e673387f..925682fd86b 100644 --- a/pkg/kubelet/cadvisor/testing/cadvisor_fake.go +++ b/pkg/kubelet/cadvisor/testing/cadvisor_fake.go @@ -46,11 +46,6 @@ func (c *Fake) Start() error { return nil } -// ContainerInfo is a fake implementation of Interface.ContainerInfo. -func (c *Fake) ContainerInfo(name string, req *cadvisorapi.ContainerInfoRequest) (*cadvisorapi.ContainerInfo, error) { - return new(cadvisorapi.ContainerInfo), nil -} - // ContainerInfoV2 is a fake implementation of Interface.ContainerInfoV2. func (c *Fake) ContainerInfoV2(name string, options cadvisorapiv2.RequestOptions) (map[string]cadvisorapiv2.ContainerInfo, error) { return map[string]cadvisorapiv2.ContainerInfo{}, nil diff --git a/pkg/kubelet/cadvisor/testing/cadvisor_mock.go b/pkg/kubelet/cadvisor/testing/cadvisor_mock.go index f11bb9bba8a..ce35a228201 100644 --- a/pkg/kubelet/cadvisor/testing/cadvisor_mock.go +++ b/pkg/kubelet/cadvisor/testing/cadvisor_mock.go @@ -67,21 +67,6 @@ func (mr *MockInterfaceMockRecorder) ContainerFsInfo() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ContainerFsInfo", reflect.TypeOf((*MockInterface)(nil).ContainerFsInfo)) } -// ContainerInfo mocks base method. -func (m *MockInterface) ContainerInfo(name string, req *v1.ContainerInfoRequest) (*v1.ContainerInfo, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ContainerInfo", name, req) - ret0, _ := ret[0].(*v1.ContainerInfo) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// ContainerInfo indicates an expected call of ContainerInfo. -func (mr *MockInterfaceMockRecorder) ContainerInfo(name, req interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ContainerInfo", reflect.TypeOf((*MockInterface)(nil).ContainerInfo), name, req) -} - // ContainerInfoV2 mocks base method. func (m *MockInterface) ContainerInfoV2(name string, options v2.RequestOptions) (map[string]v2.ContainerInfo, error) { m.ctrl.T.Helper() diff --git a/pkg/kubelet/cadvisor/types.go b/pkg/kubelet/cadvisor/types.go index ef001718b5a..153ca8c01a6 100644 --- a/pkg/kubelet/cadvisor/types.go +++ b/pkg/kubelet/cadvisor/types.go @@ -26,7 +26,6 @@ import ( // Interface is an abstract interface for testability. It abstracts the interface to cAdvisor. type Interface interface { Start() error - ContainerInfo(name string, req *cadvisorapi.ContainerInfoRequest) (*cadvisorapi.ContainerInfo, 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)