Skip to content

Restore sorting #320

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

Merged
SuperSandro2000 merged 3 commits into from
Feb 12, 2026
+8 −18
Merged

Restore sorting #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e393cb
Restore sorting
k-fabryczny Feb 12, 2026
ea53ff1
Remove empty lines for linter
k-fabryczny Feb 12, 2026
8e5b2a3
Add new line for linter
k-fabryczny Feb 12, 2026
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: 2 additions & 7 deletions controllers/absence_prometheusrule.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (
"reflect"
"sort"
"strings"
"testing"
"text/template"
"time"

Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
17 changes: 6 additions & 11 deletions controllers/alert_rule.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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),
Expand Down Expand Up @@ -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
}