chore: Add missing starting/skipping finalize logs

Author: Baarsgaard

controllers/alertrulegroup_controller.go

@@ -292,6 +292,7 @@ func (r *GrafanaAlertRuleGroupReconciler) reconcileWithInstance(ctx context.Cont
 
 func (r *GrafanaAlertRuleGroupReconciler) finalize(ctx context.Context, group *grafanav1beta1.GrafanaAlertRuleGroup) error {
 	log := logf.FromContext(ctx)
+	log.Info("Finalizing GrafanaAlertRuleGroup")
 
 	isCleanupInGrafanaRequired := true
 
@@ -310,6 +311,7 @@ func (r *GrafanaAlertRuleGroupReconciler) finalize(ctx context.Context, group *g
 	for _, instance := range instances {
 		found, _ := instance.Status.AlertRuleGroups.Find(group.Namespace, group.Name)
 		if !found {
+			log.Info("alertrulegroup not found on instance - skipping finalize", "grafana", instance.Name, "name", group.GroupName())
 			continue
 		}
 

controllers/contactpoint_controller.go

@@ -239,8 +239,9 @@ func (r *GrafanaContactPointReconciler) finalize(ctx context.Context, contactPoi
 	}
 
 	for _, instance := range instances {
-		found, _ := instance.Status.ContactPoints.Find(contactPoint.Namespace, contactPoint.Name)
+		found, uid := instance.Status.ContactPoints.Find(contactPoint.Namespace, contactPoint.Name)
 		if !found {
+			log.Info("contactpoint not found on instance - skipping finalize", "grafana", instance.Name, "uid", uid)
 			continue
 		}
 

controllers/dashboard_controller.go

@@ -219,6 +219,7 @@ func (r *GrafanaDashboardReconciler) Reconcile(ctx context.Context, req ctrl.Req
 
 func (r *GrafanaDashboardReconciler) finalize(ctx context.Context, cr *v1beta1.GrafanaDashboard) error {
 	log := logf.FromContext(ctx)
+	log.Info("Finalizing GrafanaDashboard")
 
 	instances, err := GetScopedMatchingInstances(ctx, r.Client, cr)
 	if err != nil {
@@ -228,6 +229,7 @@ func (r *GrafanaDashboardReconciler) finalize(ctx context.Context, cr *v1beta1.G
 	for _, grafana := range instances {
 		found, uid := grafana.Status.Dashboards.Find(cr.Namespace, cr.Name)
 		if !found {
+			log.Info("dashboard not found on instance - skipping finalize", "grafana", grafana.Name, "uid", uid)
 			continue
 		}
 

controllers/datasource_controller.go

@@ -214,6 +214,9 @@ func (r *GrafanaDatasourceReconciler) deleteOldDatasource(ctx context.Context, c
 }
 
 func (r *GrafanaDatasourceReconciler) finalize(ctx context.Context, cr *v1beta1.GrafanaDatasource) error {
+	log := logf.FromContext(ctx)
+	log.Info("Finalizing GrafanaDatasource")
+
 	instances, err := GetScopedMatchingInstances(ctx, r.Client, cr)
 	if err != nil {
 		return fmt.Errorf("fetching instances: %w", err)
@@ -222,6 +225,7 @@ func (r *GrafanaDatasourceReconciler) finalize(ctx context.Context, cr *v1beta1.
 	for _, grafana := range instances {
 		found, uid := grafana.Status.Datasources.Find(cr.Namespace, cr.Name)
 		if !found {
+			log.Info("datasource not found on instance - skipping finalize", "grafana", grafana.Name, "uid", uid)
 			continue
 		}
 

controllers/folder_controller.go

@@ -151,6 +151,9 @@ func (r *GrafanaFolderReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 }
 
 func (r *GrafanaFolderReconciler) finalize(ctx context.Context, folder *grafanav1beta1.GrafanaFolder) error {
+	log := logf.FromContext(ctx)
+	log.Info("Finalizing GrafanaFolder")
+
 	instances, err := GetScopedMatchingInstances(ctx, r.Client, folder)
 	if err != nil {
 		return fmt.Errorf("fetching instances: %w", err)
@@ -162,6 +165,7 @@ func (r *GrafanaFolderReconciler) finalize(ctx context.Context, folder *grafanav
 	for _, grafana := range instances {
 		found, uid := grafana.Status.Folders.Find(folder.Namespace, folder.Name)
 		if !found {
+			log.Info("folder not found on instance - skipping finalize", "grafana", grafana.Name, "uid", uid)
 			continue
 		}
 

controllers/librarypanel_controller.go

@@ -237,7 +237,7 @@ func (r *GrafanaLibraryPanelReconciler) reconcileWithInstance(ctx context.Contex
 
 func (r *GrafanaLibraryPanelReconciler) finalize(ctx context.Context, libraryPanel *v1beta1.GrafanaLibraryPanel) error {
 	log := logf.FromContext(ctx)
-	log.Info("finalizing GrafanaLibraryPanel")
+	log.Info("Finalizing GrafanaLibraryPanel")
 
 	uid := content.CustomUIDOrUID(libraryPanel, libraryPanel.Status.UID)
 
@@ -249,6 +249,7 @@ func (r *GrafanaLibraryPanelReconciler) finalize(ctx context.Context, libraryPan
 	for _, instance := range instances {
 		found, _ := instance.Status.LibraryPanels.Find(libraryPanel.Namespace, libraryPanel.Name)
 		if !found {
+			log.Info("librarypanel not found on instance - skipping finalize", "grafana", instance.Name, "uid", uid)
 			continue
 		}
 

controllers/mutetiming_controller.go

@@ -216,8 +216,9 @@ func (r *GrafanaMuteTimingReconciler) finalize(ctx context.Context, muteTiming *
 	}
 
 	for _, instance := range instances {
-		found, _ := instance.Status.MuteTimings.Find(muteTiming.Namespace, muteTiming.Name)
+		found, name := instance.Status.MuteTimings.Find(muteTiming.Namespace, muteTiming.Name)
 		if !found {
+			log.Info("mutetiming not found on instance - skipping finalize", "grafana", instance.Name, "name", name)
 			continue
 		}
 

controllers/notificationpolicy_controller.go

@@ -308,6 +308,7 @@ func (r *GrafanaNotificationPolicyReconciler) reconcileWithInstance(ctx context.
 
 func (r *GrafanaNotificationPolicyReconciler) finalize(ctx context.Context, notificationPolicy *v1beta1.GrafanaNotificationPolicy) error {
 	log := logf.FromContext(ctx)
+	log.Info("Finalizing GrafanaNotificationPolicy")
 
 	instances, err := GetScopedMatchingInstances(ctx, r.Client, notificationPolicy)
 	if err != nil {

controllers/notificationtemplate_controller.go

@@ -165,8 +165,9 @@ func (r *GrafanaNotificationTemplateReconciler) finalize(ctx context.Context, no
 	}
 
 	for _, instance := range instances {
-		found, _ := instance.Status.NotificationTemplates.Find(notificationTemplate.Namespace, notificationTemplate.Name)
+		found, name := instance.Status.NotificationTemplates.Find(notificationTemplate.Namespace, notificationTemplate.Name)
 		if !found {
+			log.Info("notificationtemplate not found on instance - skipping finalize", "grafana", instance.Name, "name", name)
 			continue
 		}