diff --git a/controllers/absence_prometheusrule.go b/controllers/absence_prometheusrule.go index 1771e7bb..85c63645 100644 --- a/controllers/absence_prometheusrule.go +++ b/controllers/absence_prometheusrule.go @@ -11,7 +11,6 @@ import ( "reflect" "sort" "strings" - "testing" "text/template" "time" @@ -121,9 +120,7 @@ func updateAnnotationTime(absencePromRule *monitoringv1.PrometheusRule) { } func (r *PrometheusRuleReconciler) createAbsencePrometheusRule(ctx context.Context, absencePromRule *monitoringv1.PrometheusRule) error { - if testing.Testing() { - sortRuleGroups(absencePromRule) - } + sortRuleGroups(absencePromRule) updateAnnotationTime(absencePromRule) if err := r.Create(ctx, absencePromRule); err != nil { return err @@ -140,9 +137,7 @@ func (r *PrometheusRuleReconciler) patchAbsencePrometheusRule( unmodifiedAbsencePromRule *monitoringv1.PrometheusRule, ) error { - if testing.Testing() { - sortRuleGroups(absencePromRule) - } + sortRuleGroups(absencePromRule) updateAnnotationTime(absencePromRule) if err := r.Patch(ctx, absencePromRule, client.MergeFrom(unmodifiedAbsencePromRule)); err != nil { return err diff --git a/controllers/alert_rule.go b/controllers/alert_rule.go index 9969c4c7..7496db18 100644 --- a/controllers/alert_rule.go +++ b/controllers/alert_rule.go @@ -10,7 +10,6 @@ import ( "sort" "strings" "sync" - "testing" "github.com/go-logr/logr" monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" @@ -167,11 +166,9 @@ func ParseRuleGroups(logger logr.Logger, in []monitoringv1.RuleGroup, promRuleNa if len(absenceAlertRules) > 0 { // Sort alert rules for consistent test results. - if testing.Testing() { - sort.SliceStable(absenceAlertRules, func(i, j int) bool { - return absenceAlertRules[i].Alert < absenceAlertRules[j].Alert - }) - } + sort.SliceStable(absenceAlertRules, func(i, j int) bool { + return absenceAlertRules[i].Alert < absenceAlertRules[j].Alert + }) out = append(out, monitoringv1.RuleGroup{ Name: AbsenceRuleGroupName(promRuleName, g.Name), @@ -289,11 +286,9 @@ func parseRule(logger logr.Logger, in monitoringv1.Rule, keepLabel KeepLabel) ([ } // Sort alert rules for consistent test results. - if testing.Testing() { - sort.SliceStable(out, func(i, j int) bool { - return out[i].Alert < out[j].Alert - }) - } + sort.SliceStable(out, func(i, j int) bool { + return out[i].Alert < out[j].Alert + }) return out, nil }