Sort incompatible CSVs in the Upgradeable condition message

pkg/controller/operators/openshift/helpers.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"sort"
 	"strings"
 	"sync"
 
@@ -77,18 +78,25 @@ func versionsMatch(a []configv1.OperandVersion, b []configv1.OperandVersion) boo
 type skews []skew
 
 func (s skews) String() string {
-	msg := make([]string, len(s))
-	i, j := 0, len(s)-1
-	for _, sk := range s {
-		m := sk.String()
-		// Partial order: error skews first
-		if sk.err != nil {
-			msg[i] = m
-			i++
-			continue
+	// Sort so the message does not depend on the (unstable) order in which the
+	// CSVs were listed: error skews first, then by namespace/name. A different
+	// order would be a different Message, and so a condition transition.
+	sorted := make(skews, len(s))
+	copy(sorted, s)
+	sort.SliceStable(sorted, func(i, j int) bool {
+		a, b := sorted[i], sorted[j]
+		if (a.err != nil) != (b.err != nil) {
+			return a.err != nil
+		}
+		if a.namespace != b.namespace {
+			return a.namespace < b.namespace
 		}
-		msg[j] = m
-		j--
+		return a.name < b.name
+	})
+
+	msg := make([]string, len(sorted))
+	for i, sk := range sorted {
+		msg[i] = sk.String()
 	}
 
 	// TODO Revisit this message after 4.23 release once release schedule is determined for future possible minor versions.

pkg/controller/operators/openshift/helpers_test.go

@@ -815,3 +815,20 @@ func TestNormalizeOCPVersion(t *testing.T) {
 		})
 	}
 }
+
+func TestSkewsStringIsDeterministic(t *testing.T) {
+	// The informer cache lists CSVs in map order. The condition message must not
+	// depend on that order, or every reorder counts as a condition transition.
+	a := skew{namespace: "openshift-logging", name: "cluster-logging.v6.6.1", maxOpenShiftVersion: "4.23"}
+	b := skew{namespace: "openshift-cluster-csi-drivers", name: "secrets-store-csi-driver-operator.v4.22.0", maxOpenShiftVersion: "5.0"}
+	invalid := skew{namespace: "openshift-logging", name: "broken.v1.0.0", err: fmt.Errorf("invalid")}
+
+	expected := "ClusterServiceVersions blocking minor version upgrades to 4.23 or major version upgrades to 5.0:\n" +
+		invalid.String() + "\n" + // error skews first
+		b.String() + "\n" + // then by namespace/name
+		a.String()
+
+	require.Equal(t, expected, skews{a, b, invalid}.String())
+	require.Equal(t, expected, skews{invalid, b, a}.String())
+	require.Equal(t, expected, skews{b, invalid, a}.String())
+}