Only update LastResync if it has expired (#1110)

* Only update LastResync if it has expired Solves #1109
grafana · Jun 16, 2023 · 9321239 · 9321239
1 parent 91d73f2
commit 9321239
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/controllers/dashboard_controller.go b/controllers/dashboard_controller.go
@@ -256,8 +256,10 @@ func (r *GrafanaDashboardReconciler) Reconcile(ctx context.Context, req ctrl.Req
 
 	// if the dashboard was successfully synced in all instances, wait for its re-sync period
 	if success {
+		if cr.ResyncPeriodHasElapsed() {
+			cr.Status.LastResync = metav1.Time{Time: time.Now()}
+		}
 		cr.Status.Hash = hash
-		cr.Status.LastResync = metav1.Time{Time: time.Now()}
 		cr.Status.UID = uid
 		return ctrl.Result{RequeueAfter: cr.GetResyncPeriod()}, r.Client.Status().Update(ctx, cr)
 	}

diff --git a/controllers/datasource_controller.go b/controllers/datasource_controller.go
@@ -250,7 +250,9 @@ func (r *GrafanaDatasourceReconciler) Reconcile(ctx context.Context, req ctrl.Re
 	if success {
 		cr.Status.LastMessage = ""
 		cr.Status.Hash = hash
-		cr.Status.LastResync = metav1.Time{Time: time.Now()}
+		if cr.ResyncPeriodHasElapsed() {
+			cr.Status.LastResync = metav1.Time{Time: time.Now()}
+		}
 		cr.Status.UID = datasource.UID
 		return ctrl.Result{RequeueAfter: cr.GetResyncPeriod()}, r.Client.Status().Update(ctx, cr)
 	} else {