Skip to content

Commit dd0b8cc

Browse files
committed
pkg/cvo/status.go: sort implicitly enabled caps
in condition message to avoid test failures caused by bg sync timing that affects the order of the implictly enabled capabilities.
1 parent 9d57cfc commit dd0b8cc

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

pkg/cvo/status.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"encoding/json"
77
"fmt"
88
"math"
9+
"sort"
910
"strings"
1011
"time"
1112

@@ -375,6 +376,7 @@ func setImplicitlyEnabledCapabilitiesCondition(config *configv1.ClusterVersion,
375376
for i, c := range implicitlyEnabled {
376377
caps[i] = string(c)
377378
}
379+
sort.Strings(caps)
378380
message = message + strings.Join([]string(caps), ", ")
379381

380382
resourcemerge.SetOperatorStatusCondition(&config.Status.Conditions, configv1.ClusterOperatorStatusCondition{

0 commit comments

Comments
 (0)