chore: Remove controllerLog in folder reconciler

grafana · Dec 30, 2024 · 1f6f31e · 1f6f31e
1 parent 0c1e28f
commit 1f6f31e
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/controllers/grafanafolder_controller.go b/controllers/grafanafolder_controller.go
@@ -154,8 +154,7 @@ func (r *GrafanaFolderReconciler) syncFolders(ctx context.Context) (ctrl.Result,
 // For more details, check Reconcile and its Result here:
 // - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.9.2/pkg/reconcile
 func (r *GrafanaFolderReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
-	controllerLog := log.FromContext(ctx).WithName("GrafanaFolderReconciler")
-	r.Log = controllerLog
+	r.Log = log.FromContext(ctx).WithName("GrafanaFolderReconciler")
 
 	// periodic sync reconcile
 	if req.Namespace == "" && req.Name == "" {
@@ -215,7 +214,7 @@ func (r *GrafanaFolderReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 	}
 	removeInvalidSpec(&folder.Status.Conditions)
 
-	instances, err := GetScopedMatchingInstances(controllerLog, ctx, r.Client, folder)
+	instances, err := GetScopedMatchingInstances(r.Log, ctx, r.Client, folder)
 	if err != nil || len(instances) == 0 {
 		setNoMatchingInstancesCondition(&folder.Status.Conditions, folder.Generation, err)
 		folder.Status.NoMatchingInstances = true
@@ -229,7 +228,7 @@ func (r *GrafanaFolderReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 
 	removeNoMatchingInstance(&folder.Status.Conditions)
 	folder.Status.NoMatchingInstances = false
-	controllerLog.Info("found matching Grafana instances for folder", "count", len(instances))
+	r.Log.Info("found matching Grafana instances for folder", "count", len(instances))
 
 	applyErrors := make(map[string]string)
 	for _, grafana := range instances {