Skip to content

Commit 14dffd7

Browse files
committed
Sort ConditionalUpdateRisks by name
1 parent 7a10659 commit 14dffd7

2 files changed

Lines changed: 7 additions & 4 deletions

File tree

pkg/cvo/status.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,9 @@ func conditionalUpdateRisks(conditionalUpdates []configv1.ConditionalUpdate) []c
485485
result = append(result, risk)
486486
}
487487
}
488+
sort.Slice(result, func(i, j int) bool {
489+
return result[i].Name < result[j].Name
490+
})
488491
return result
489492
}
490493

pkg/cvo/status_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1125,15 +1125,15 @@ func Test_conditionalUpdateRisks(t *testing.T) {
11251125
Type: "Applies",
11261126
Status: metav1.ConditionTrue,
11271127
},
1128-
}}, {Name: "Risk3",
1128+
}}, {Name: "Risk2",
11291129
Conditions: []metav1.Condition{{
11301130
Type: "Applies",
1131-
Status: metav1.ConditionTrue,
1131+
Status: metav1.ConditionFalse,
11321132
},
1133-
}}, {Name: "Risk2",
1133+
}}, {Name: "Risk3",
11341134
Conditions: []metav1.Condition{{
11351135
Type: "Applies",
1136-
Status: metav1.ConditionFalse,
1136+
Status: metav1.ConditionTrue,
11371137
},
11381138
}}},
11391139
},

0 commit comments

Comments
 (0)