fix: initialize event recorder in datasource controller

rewantsoni · Oct 18, 2021 · a848388 · a848388
1 parent ceb0588
commit a848388
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/controllers/grafanadatasource/datasource_controller.go b/controllers/grafanadatasource/datasource_controller.go
@@ -48,7 +48,7 @@ type GrafanaDatasourceReconciler struct {
 	Scheme   *runtime.Scheme
 	Context  context.Context
 	Cancel   context.CancelFunc
-	recorder record.EventRecorder
+	Recorder record.EventRecorder
 	Logger   logr.Logger
 }
 
@@ -155,7 +155,7 @@ func (r *GrafanaDatasourceReconciler) reconcileDataSources(state *common.DataSou
 		// finally, update the configmap
 		err = r.Client.Update(r.Context, state.KnownDataSources)
 		if err != nil {
-			r.recorder.Event(state.KnownDataSources, "Warning", "UpdateError", err.Error())
+			r.Recorder.Event(state.KnownDataSources, "Warning", "UpdateError", err.Error())
 		} else {
 			r.manageSuccess(updated)
 		}
@@ -194,7 +194,7 @@ func (i *GrafanaDatasourceReconciler) updateHash(known *v1.ConfigMap) (string, e
 
 // Handle error case: update datasource with error message and status
 func (r *GrafanaDatasourceReconciler) manageError(datasource *grafanav1alpha1.GrafanaDataSource, issue error) {
-	r.recorder.Event(datasource, "Warning", "ProcessingError", issue.Error())
+	r.Recorder.Event(datasource, "Warning", "ProcessingError", issue.Error())
 
 	// datasource deleted
 	if datasource == nil {
@@ -227,7 +227,7 @@ func (r *GrafanaDatasourceReconciler) manageSuccess(datasources []grafanav1alpha
 
 		err := r.Client.Status().Update(r.Context, &datasources[i])
 		if err != nil {
-			r.recorder.Event(&datasources[i], "Warning", "UpdateError", err.Error())
+			r.Recorder.Event(&datasources[i], "Warning", "UpdateError", err.Error())
 		}
 	}
 }

diff --git a/main.go b/main.go
@@ -237,11 +237,12 @@ func main() { // nolint
 		os.Exit(1)
 	}
 	if err = (&grafanadatasource.GrafanaDatasourceReconciler{
-		Client:  mgr.GetClient(),
-		Context: ctx,
-		Cancel:  cancel,
-		Logger:  ctrl.Log.WithName("controllers").WithName("GrafanaDatasource"),
-		Scheme:  mgr.GetScheme(),
+		Client:   mgr.GetClient(),
+		Context:  ctx,
+		Cancel:   cancel,
+		Logger:   ctrl.Log.WithName("controllers").WithName("GrafanaDatasource"),
+		Scheme:   mgr.GetScheme(),
+		Recorder: mgr.GetEventRecorderFor("GrafanaDatasource"),
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "GrafanaDatasource")
 		os.Exit(1)