Merge branch 'master' into fix-1483

grafana · Apr 29, 2024 · c609650 · c609650
2 parents d2e1403 + e0d3ad8
commit c609650
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/controllers/dashboard_controller.go b/controllers/dashboard_controller.go
@@ -305,10 +305,14 @@ func (r *GrafanaDashboardReconciler) onDashboardDeleted(ctx context.Context, nam
 			resp, err := grafanaClient.Dashboards.GetDashboardByUID(*uid)
 			if err != nil {
 				var notFound *dashboards.GetDashboardByUIDNotFound
-				if !errors.As(err, &notFound) {
-					return err
+				if errors.As(err, &notFound) {
+					// nothing to do if the dashboard doesn't exist
+					return nil
 				}
+
+				return err
 			}
+
 			dash := resp.GetPayload()
 
 			_, err = grafanaClient.Dashboards.DeleteDashboardByUID(*uid) //nolint:errcheck