From 2f68cddbd2f8328de2e6725785633b96ed5bb6cf Mon Sep 17 00:00:00 2001 From: Vishnu Kannan Date: Thu, 9 Apr 2015 15:38:36 -0700 Subject: [PATCH] Adding events API to cadvisor interface. --- pkg/kubelet/cadvisor/cadvisor_fake.go | 4 ++-- pkg/kubelet/cadvisor/cadvisor_linux.go | 4 ++-- pkg/kubelet/cadvisor/cadvisor_mock.go | 4 ++-- pkg/kubelet/cadvisor/cadvisor_unsupported.go | 4 ++-- pkg/kubelet/cadvisor/types.go | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkg/kubelet/cadvisor/cadvisor_fake.go b/pkg/kubelet/cadvisor/cadvisor_fake.go index 1bd57c7e41e..7667ff372ca 100644 --- a/pkg/kubelet/cadvisor/cadvisor_fake.go +++ b/pkg/kubelet/cadvisor/cadvisor_fake.go @@ -52,6 +52,6 @@ func (c *Fake) DockerImagesFsInfo() (cadvisorApiV2.FsInfo, error) { return cadvisorApiV2.FsInfo{}, nil } -func (c *Fake) GetPastEvents(request *events.Request) ([]*cadvisorApi.Event, error) { - return []*cadvisorApi.Event{}, nil +func (c *Fake) WatchEvents(request *events.Request) (*events.EventChannel, error) { + return new(events.EventChannel), nil } diff --git a/pkg/kubelet/cadvisor/cadvisor_linux.go b/pkg/kubelet/cadvisor/cadvisor_linux.go index 46724f327af..6ba35f573be 100644 --- a/pkg/kubelet/cadvisor/cadvisor_linux.go +++ b/pkg/kubelet/cadvisor/cadvisor_linux.go @@ -147,6 +147,6 @@ func (cc *cadvisorClient) DockerImagesFsInfo() (cadvisorApiV2.FsInfo, error) { return res[0], nil } -func (cc *cadvisorClient) GetPastEvents(request *events.Request) ([]*cadvisorApi.Event, error) { - return cc.GetPastEvents(request) +func (cc *cadvisorClient) WatchEvents(request *events.Request) (*events.EventChannel, error) { + return cc.WatchForEvents(request) } diff --git a/pkg/kubelet/cadvisor/cadvisor_mock.go b/pkg/kubelet/cadvisor/cadvisor_mock.go index 371f30526cb..1c0411fdaf9 100644 --- a/pkg/kubelet/cadvisor/cadvisor_mock.go +++ b/pkg/kubelet/cadvisor/cadvisor_mock.go @@ -62,7 +62,7 @@ func (c *Mock) DockerImagesFsInfo() (cadvisorApiV2.FsInfo, error) { return args.Get(0).(cadvisorApiV2.FsInfo), args.Error(1) } -func (c *Mock) GetPastEvents(request *events.Request) ([]*cadvisorApi.Event, error) { +func (c *Mock) WatchEvents(request *events.Request) (*events.EventChannel, error) { args := c.Called() - return args.Get(0).([]*cadvisorApi.Event), args.Error(1) + return args.Get(0).(*events.EventChannel), args.Error(1) } diff --git a/pkg/kubelet/cadvisor/cadvisor_unsupported.go b/pkg/kubelet/cadvisor/cadvisor_unsupported.go index b0300ef5bc0..e848e63481a 100644 --- a/pkg/kubelet/cadvisor/cadvisor_unsupported.go +++ b/pkg/kubelet/cadvisor/cadvisor_unsupported.go @@ -61,6 +61,6 @@ func (cu *cadvisorUnsupported) DockerImagesFsInfo() (cadvisorApiV2.FsInfo, error return cadvisorApiV2.FsInfo{}, unsupportedErr } -func (cu *cadvisorUnsupported) GetPastEvents(request *events.Request) ([]*cadvisorApi.Event, error) { - return []*cadvisorApi.Event{}, unsupportedErr +func (cu *cadvisorUnsupported) WatchEvents(request *events.Request) (*events.EventChannel, error) { + return nil, unsupportedErr } diff --git a/pkg/kubelet/cadvisor/types.go b/pkg/kubelet/cadvisor/types.go index b14154645c6..1d70302f4fd 100644 --- a/pkg/kubelet/cadvisor/types.go +++ b/pkg/kubelet/cadvisor/types.go @@ -34,6 +34,6 @@ type Interface interface { // Returns usage information about the filesystem holding Docker images. DockerImagesFsInfo() (cadvisorApiV2.FsInfo, error) - // Get past events that have been detected and that fit the request. - GetPastEvents(request *events.Request) ([]*cadvisorApi.Event, error) + // Get events streamed through passedChannel that fit the request. + WatchEvents(request *events.Request) (*events.EventChannel, error) }