Merge pull request #1504 from grafana/fix-1498

fix: do not delete non-existing dashboard
grafana · Apr 23, 2024 · e0d3ad8 · e0d3ad8
2 parents aa532c3 + 616e2f8
commit e0d3ad8
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