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

Jump to bottom

Fix Reconciliation errors when PromRule/ConfigMap doesn't exist #993

Merged
merged 1 commit into from
Dec 6, 2023
Merged

Fix Reconciliation errors when PromRule/ConfigMap doesn't exist #993

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
9 changes: 4 additions & 5 deletions kubernetes/controllers/servicelevelobjective.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,9 @@ func (r *ServiceLevelObjectiveReconciler) reconcilePrometheusRule(ctx context.Co
if err := r.Create(ctx, newRule); err != nil {
return ctrl.Result{}, err
}
return ctrl.Result{}, fmt.Errorf("failed to create prometheus rule: %w", err)
} else {
return ctrl.Result{}, fmt.Errorf("failed to get prometheus rule: %w", err)
}

return ctrl.Result{}, fmt.Errorf("failed to get prometheus rule: %w", err)
}

newRule.ResourceVersion = rule.ResourceVersion
Expand Down Expand Up @@ -123,9 +122,9 @@ func (r *ServiceLevelObjectiveReconciler) reconcileConfigMap(
if err := r.Create(ctx, newConfigMap); err != nil {
return ctrl.Result{}, fmt.Errorf("failed to create config map: %w", err)
}
} else {
return ctrl.Result{}, fmt.Errorf("failed to get config map: %w", err)
}

return ctrl.Result{}, err
}

newConfigMap.ResourceVersion = existingConfigMap.ResourceVersion
Expand Down