Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: use correct error propagation logic in alert rule group handler #1584

Merged
merged 1 commit into from
Jun 19, 2024
Merged

fix: use correct error propagation logic in alert rule group handler #1584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions controllers/controller_shared.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,10 @@ func setNoMatchingInstance(conditions *[]metav1.Condition, generation int64, rea
})
}

func removeNoMatchingInstance(conditions *[]metav1.Condition) {
meta.RemoveStatusCondition(conditions, conditionNoMatchingInstance)
}

func setNoMatchingFolder(conditions *[]metav1.Condition, generation int64, reason, message string) {
meta.SetStatusCondition(conditions, metav1.Condition{
Type: conditionNoMatchingFolder,
Expand All @@ -135,8 +139,8 @@ func setNoMatchingFolder(conditions *[]metav1.Condition, generation int64, reaso
})
}

func removeNoMatchingInstance(conditions *[]metav1.Condition) {
meta.RemoveStatusCondition(conditions, conditionNoMatchingInstance)
func removeNoMatchingFolder(conditions *[]metav1.Condition) {
meta.RemoveStatusCondition(conditions, conditionNoMatchingFolder)
}

func ignoreStatusUpdates() predicate.Predicate {
Expand Down
14 changes: 7 additions & 7 deletions controllers/grafanaalertrulegroup_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,20 +76,20 @@ func (r *GrafanaAlertRuleGroupReconciler) Reconcile(ctx context.Context, req ctr
return ctrl.Result{}, nil
}
controllerLog.Error(err, "error getting grafana alertrulegroup cr")
return ctrl.Result{RequeueAfter: RequeueDelay}, err
return ctrl.Result{}, err
}

if group.GetDeletionTimestamp() != nil {
if controllerutil.ContainsFinalizer(group, grafanaFinalizer) {
// still need to clean up
err := r.finalize(ctx, group)
if err != nil {
return ctrl.Result{RequeueAfter: RequeueDelay}, fmt.Errorf("cleaning up alert rule group: %w", err)
return ctrl.Result{}, fmt.Errorf("cleaning up alert rule group: %w", err)
}
controllerutil.RemoveFinalizer(group, grafanaFinalizer)
if err := r.Update(ctx, group); err != nil {
r.Log.Error(err, "failed to remove finalizer")
return ctrl.Result{RequeueAfter: RequeueDelay}, err
return ctrl.Result{}, err
}
}
return ctrl.Result{}, nil
Expand All @@ -114,20 +114,19 @@ func (r *GrafanaAlertRuleGroupReconciler) Reconcile(ctx context.Context, req ctr
setNoMatchingInstance(&group.Status.Conditions, group.Generation, "ErrFetchingInstances", fmt.Sprintf("error occurred during fetching of instances: %s", err.Error()))
meta.RemoveStatusCondition(&group.Status.Conditions, conditionAlertGroupSynchronized)
r.Log.Error(err, "could not find matching instances")
return ctrl.Result{RequeueAfter: RequeueDelay}, err
return ctrl.Result{}, err
}

if len(instances) == 0 {
meta.RemoveStatusCondition(&group.Status.Conditions, conditionAlertGroupSynchronized)
setNoMatchingInstance(&group.Status.Conditions, group.Generation, "EmptyAPIReply", "Instances could not be fetched, reconciliation will be retried")
return ctrl.Result{}, nil
return ctrl.Result{}, fmt.Errorf("no instances found")
}

removeNoMatchingInstance(&group.Status.Conditions)
folderUID := r.GetFolderUID(ctx, group)
if folderUID == "" {
// error is already set in conditions
return ctrl.Result{}, nil
return ctrl.Result{}, fmt.Errorf("folder uid not found")
}

applyErrors := make(map[string]string)
Expand Down Expand Up @@ -375,5 +374,6 @@ func (r *GrafanaAlertRuleGroupReconciler) GetFolderUID(ctx context.Context, grou
setNoMatchingFolder(&group.Status.Conditions, group.Generation, "ErrFetchingFolder", fmt.Sprintf("Failed to fetch folder: %s", err.Error()))
return ""
}
removeNoMatchingFolder(&group.Status.Conditions)
return string(folder.UID)
}
Loading