From 7cf76ea019583a328b2c1d3cb1abf362eb3c16a5 Mon Sep 17 00:00:00 2001 From: Arthur Silva Sens Date: Mon, 27 Nov 2023 14:27:15 -0300 Subject: [PATCH] Fix Reconciliation errors when PromRule/ConfigMap doesn't exist Signed-off-by: Arthur Silva Sens (cherry picked from commit fad4f842966135042fe2c5c15249426f1b9a353b) --- kubernetes/controllers/servicelevelobjective.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/kubernetes/controllers/servicelevelobjective.go b/kubernetes/controllers/servicelevelobjective.go index a01c4d9be..46f6a2ccb 100644 --- a/kubernetes/controllers/servicelevelobjective.go +++ b/kubernetes/controllers/servicelevelobjective.go @@ -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 @@ -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