WatchEvents seems useless

Signed-off-by: Davanum Srinivas <davanum@gmail.com>

pkg/kubelet/cadvisor/cadvisor_linux.go

@@ -34,7 +34,6 @@ import (
 
 	"github.com/google/cadvisor/cache/memory"
 	cadvisormetrics "github.com/google/cadvisor/container"
-	"github.com/google/cadvisor/events"
 	cadvisorapi "github.com/google/cadvisor/info/v1"
 	cadvisorapiv2 "github.com/google/cadvisor/info/v2"
 	"github.com/google/cadvisor/manager"
@@ -176,7 +175,3 @@ func (cc *cadvisorClient) ContainerFsInfo() (cadvisorapiv2.FsInfo, error) {
 	}
 	return cc.getFsInfo(label)
 }
-
-func (cc *cadvisorClient) WatchEvents(request *events.Request) (*events.EventChannel, error) {
-	return cc.WatchForEvents(request)
-}

pkg/kubelet/cadvisor/cadvisor_unsupported.go

@@ -22,7 +22,6 @@ package cadvisor
 import (
 	"errors"
 
-	"github.com/google/cadvisor/events"
 	cadvisorapi "github.com/google/cadvisor/info/v1"
 	cadvisorapiv2 "github.com/google/cadvisor/info/v2"
 )
@@ -71,10 +70,6 @@ func (cu *cadvisorUnsupported) ContainerFsInfo() (cadvisorapiv2.FsInfo, error) {
 	return cadvisorapiv2.FsInfo{}, errUnsupported
 }
 
-func (cu *cadvisorUnsupported) WatchEvents(request *events.Request) (*events.EventChannel, error) {
-	return nil, errUnsupported
-}
-
 func (cu *cadvisorUnsupported) GetDirFsInfo(path string) (cadvisorapiv2.FsInfo, error) {
 	return cadvisorapiv2.FsInfo{}, nil
 }

pkg/kubelet/cadvisor/cadvisor_windows.go

@@ -20,7 +20,6 @@ limitations under the License.
 package cadvisor
 
 import (
-	"github.com/google/cadvisor/events"
 	cadvisorapi "github.com/google/cadvisor/info/v1"
 	cadvisorapiv2 "github.com/google/cadvisor/info/v2"
 	"k8s.io/kubernetes/pkg/kubelet/winstats"
@@ -75,10 +74,6 @@ func (cu *cadvisorClient) RootFsInfo() (cadvisorapiv2.FsInfo, error) {
 	return cu.GetDirFsInfo(cu.rootPath)
 }
 
-func (cu *cadvisorClient) WatchEvents(request *events.Request) (*events.EventChannel, error) {
-	return &events.EventChannel{}, nil
-}
-
 func (cu *cadvisorClient) GetDirFsInfo(path string) (cadvisorapiv2.FsInfo, error) {
 	return cu.winStatsClient.GetDirFsInfo(path)
 }

pkg/kubelet/cadvisor/testing/cadvisor_fake.go

@@ -17,7 +17,6 @@ limitations under the License.
 package testing
 
 import (
-	"github.com/google/cadvisor/events"
 	cadvisorapi "github.com/google/cadvisor/info/v1"
 	cadvisorapiv2 "github.com/google/cadvisor/info/v2"
 	"k8s.io/kubernetes/pkg/kubelet/cadvisor"
@@ -91,11 +90,6 @@ func (c *Fake) ContainerFsInfo() (cadvisorapiv2.FsInfo, error) {
 	return cadvisorapiv2.FsInfo{}, nil
 }
 
-// WatchEvents is a fake implementation of Interface.WatchEvents.
-func (c *Fake) WatchEvents(request *events.Request) (*events.EventChannel, error) {
-	return new(events.EventChannel), nil
-}
-
 // GetDirFsInfo is a fake implementation of Interface.GetDirFsInfo.
 func (c *Fake) GetDirFsInfo(path string) (cadvisorapiv2.FsInfo, error) {
 	return cadvisorapiv2.FsInfo{}, nil

pkg/kubelet/cadvisor/testing/cadvisor_mock.go

@@ -24,7 +24,6 @@ import (
 	reflect "reflect"
 
 	gomock "github.com/golang/mock/gomock"
-	events "github.com/google/cadvisor/events"
 	v1 "github.com/google/cadvisor/info/v1"
 	v2 "github.com/google/cadvisor/info/v2"
 )
@@ -186,21 +185,6 @@ func (mr *MockInterfaceMockRecorder) VersionInfo() *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "VersionInfo", reflect.TypeOf((*MockInterface)(nil).VersionInfo))
 }
 
-// WatchEvents mocks base method.
-func (m *MockInterface) WatchEvents(request *events.Request) (*events.EventChannel, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "WatchEvents", request)
-	ret0, _ := ret[0].(*events.EventChannel)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// WatchEvents indicates an expected call of WatchEvents.
-func (mr *MockInterfaceMockRecorder) WatchEvents(request interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WatchEvents", reflect.TypeOf((*MockInterface)(nil).WatchEvents), request)
-}
-
 // MockImageFsInfoProvider is a mock of ImageFsInfoProvider interface.
 type MockImageFsInfoProvider struct {
 	ctrl     *gomock.Controller

pkg/kubelet/cadvisor/types.go

@@ -18,7 +18,6 @@ limitations under the License.
 package cadvisor
 
 import (
-	"github.com/google/cadvisor/events"
 	cadvisorapi "github.com/google/cadvisor/info/v1"
 	cadvisorapiv2 "github.com/google/cadvisor/info/v2"
 )
@@ -42,9 +41,6 @@ type Interface interface {
 	// KEP 4191 can separate the image filesystem
 	ContainerFsInfo() (cadvisorapiv2.FsInfo, error)
 
-	// Get events streamed through passedChannel that fit the request.
-	WatchEvents(request *events.Request) (*events.EventChannel, error)
-
 	// Get filesystem information for the filesystem that contains the given file.
 	GetDirFsInfo(path string) (cadvisorapiv2.FsInfo, error)
 }