Skip to content

Commit b13e740

Browse files
authored
fix(prometheusrule): compare to SLO object (#89)
- instead of nil Signed-off-by: Hy3n4 <hy3nk4@gmail.com>
1 parent cac4705 commit b13e740

File tree

2 files changed

+3
-13
lines changed

2 files changed

+3
-13
lines changed

internal/controller/monitoring.coreos.com/prometheusrule_controller.go

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func (r *PrometheusRuleReconciler) Reconcile(ctx context.Context, req ctrl.Reque
7171
}
7272

7373
// if not, check if we are supposed to manage it or not
74-
if slo == nil {
74+
if reflect.DeepEqual(slo, &openslov1.SLO{}) {
7575
value, found := prometheusRule.ObjectMeta.Labels["osko.dev/manage"]
7676
if !found || value != "true" {
7777
log.Info("Not managing a PrometheusRule unrelated to osko")
@@ -105,7 +105,7 @@ func (r *PrometheusRuleReconciler) Reconcile(ctx context.Context, req ctrl.Reque
105105
err = utils.UpdateStatus(ctx, slo, r.Client, "Ready", metav1.ConditionFalse, "SLI Object not found")
106106
if err != nil {
107107
log.Error(err, "Failed to update SLO status")
108-
//r.Recorder.Event(slo, "Error", "SLIObjectNotFound", "SLI Object not found")
108+
r.Recorder.Event(slo, "Warning", "SLIObjectNotFound", "SLI Object not found")
109109
return ctrl.Result{}, nil
110110
}
111111
log.Error(err, "SLO has no SLI reference")
@@ -116,14 +116,7 @@ func (r *PrometheusRuleReconciler) Reconcile(ctx context.Context, req ctrl.Reque
116116
log.Info("PrometheusRule not found. Let's make one.")
117117
prometheusRule, err = helpers.CreatePrometheusRule(slo, sli)
118118
if err != nil {
119-
err = utils.UpdateStatus(
120-
ctx,
121-
slo,
122-
r.Client,
123-
"Ready",
124-
metav1.ConditionFalse,
125-
"Failed to create Prometheus Rule",
126-
)
119+
err = utils.UpdateStatus(ctx, slo, r.Client, "Ready", metav1.ConditionFalse, "Failed to create Prometheus Rule")
127120
if err != nil {
128121
log.Error(err, "Failed to update SLO status")
129122
return ctrl.Result{}, err

internal/helpers/prometheus_helper.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ func (mrs *MonitoringRuleSet) createBaseRuleLabels(window string) map[string]str
105105
"slo_name": mrs.Slo.Name,
106106
"window": window,
107107
}
108-
109108
}
110109

111110
func (mrs *MonitoringRuleSet) createUserDefinedRuleLabels() map[string]string {
@@ -300,8 +299,6 @@ func (mrs *MonitoringRuleSet) SetupRules() ([]monitoringv1.RuleGroup, error) {
300299
}
301300

302301
func CreatePrometheusRule(slo *openslov1.SLO, sli *openslov1.SLI) (*monitoringv1.PrometheusRule, error) {
303-
// log := ctrllog.FromContext(context.Background())
304-
305302
mrs := &MonitoringRuleSet{
306303
Slo: slo,
307304
Sli: sli,

0 commit comments

Comments
 (0)