Skip to content

Commit 68ec58f

Browse files
committed
⚠️ make manager a recorder.Provider
Manager previously conformed to a slightly different interface than recorder.Provider. This fixes that.
1 parent 762715b commit 68ec58f

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

pkg/controller/controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ func New(name string, mgr manager.Manager, options Options) (Controller, error)
8585
Config: mgr.GetConfig(),
8686
Scheme: mgr.GetScheme(),
8787
Client: mgr.GetClient(),
88-
Recorder: mgr.GetRecorder(name),
88+
Recorder: mgr.GetEventRecorderFor(name),
8989
Queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), name),
9090
MaxConcurrentReconciles: options.MaxConcurrentReconciles,
9191
Name: name,

pkg/internal/recorder/recorder_integration_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ var _ = Describe("recorder", func() {
5252
Expect(err).NotTo(HaveOccurred())
5353

5454
By("Creating the Controller")
55-
recorder := cm.GetRecorder("test-recorder")
55+
recorder := cm.GetEventRecorderFor("test-recorder")
5656
instance, err := controller.New("foo-controller", cm, controller.Options{
5757
Reconciler: reconcile.Func(
5858
func(request reconcile.Request) (reconcile.Result, error) {

pkg/manager/internal.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ func (cm *controllerManager) GetCache() cache.Cache {
166166
return cm.cache
167167
}
168168

169-
func (cm *controllerManager) GetRecorder(name string) record.EventRecorder {
169+
func (cm *controllerManager) GetEventRecorderFor(name string) record.EventRecorder {
170170
return cm.recorderProvider.GetEventRecorderFor(name)
171171
}
172172

pkg/manager/manager.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ type Manager interface {
7474
// GetCache returns a cache.Cache
7575
GetCache() cache.Cache
7676

77-
// GetRecorder returns a new EventRecorder for the provided name
78-
GetRecorder(name string) record.EventRecorder
77+
// GetEventRecorderFor returns a new EventRecorder for the provided name
78+
GetEventRecorderFor(name string) record.EventRecorder
7979

8080
// GetRESTMapper returns a RESTMapper
8181
GetRESTMapper() meta.RESTMapper

pkg/manager/manager_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ var _ = Describe("manger.Manager", func() {
604604
It("should provide a function to get the EventRecorder", func() {
605605
m, err := New(cfg, Options{})
606606
Expect(err).NotTo(HaveOccurred())
607-
Expect(m.GetRecorder("test")).NotTo(BeNil())
607+
Expect(m.GetEventRecorderFor("test")).NotTo(BeNil())
608608
})
609609
})
610610

0 commit comments

Comments
 (0)