Merge pull request #1625 from grafana/fix/backoff-requeue-on-failed-sync

theSuess · web-flow · commit ed8e2aeb7188 · 2024-07-30T11:26:30.000Z
fix: requeue on apply errors
diff --git a/controllers/grafanaalertrulegroup_controller.go b/controllers/grafanaalertrulegroup_controller.go
@@ -143,7 +143,9 @@ func (r *GrafanaAlertRuleGroupReconciler) Reconcile(ctx context.Context, req ctr
 	}
 	condition := buildSynchronizedCondition("Alert Rule Group", conditionAlertGroupSynchronized, group.Generation, applyErrors, len(instances))
 	meta.SetStatusCondition(&group.Status.Conditions, condition)
-
+	if len(applyErrors) > 0 {
+		return ctrl.Result{}, fmt.Errorf("failed to apply to all instances: %v", applyErrors)
+	}
 	return ctrl.Result{RequeueAfter: group.Spec.ResyncPeriod.Duration}, nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,9 @@ func (r *GrafanaAlertRuleGroupReconciler) Reconcile(ctx context.Context, req ctr`
`143`	`143`	`}`
`144`	`144`	`condition := buildSynchronizedCondition("Alert Rule Group", conditionAlertGroupSynchronized, group.Generation, applyErrors, len(instances))`
`145`	`145`	`meta.SetStatusCondition(&group.Status.Conditions, condition)`
`146`		`-`
	`146`	`+ if len(applyErrors) > 0 {`
	`147`	`+ return ctrl.Result{}, fmt.Errorf("failed to apply to all instances: %v", applyErrors)`
	`148`	`+ }`
`147`	`149`	`return ctrl.Result{RequeueAfter: group.Spec.ResyncPeriod.Duration}, nil`
`148`	`150`	`}`
`149`	`151`