Merge pull request #11498 from fabriziopandini/refine-v1beta2-summary

k8s-ci-robot · web-flow · commit 93b4aaca85a4 · 2024-11-28T14:50:57.000Z
🌱 Refine v1beta2 summary
diff --git a/util/conditions/v1beta2/merge_strategies.go b/util/conditions/v1beta2/merge_strategies.go
@@ -285,7 +285,7 @@ func (d *defaultMergeStrategy) Merge(conditions []ConditionWithOwnerInfo, condit
 			if condition.Message != "" {
 				m += indentIfMultiline(condition.Message)
 			} else {
-				m += " No additional info provided"
+				m += fmt.Sprintf(" %s", condition.Reason)
 			}
 			messages = append(messages, m)
 		}
diff --git a/util/conditions/v1beta2/summary_test.go b/util/conditions/v1beta2/summary_test.go
@@ -70,9 +70,9 @@ func TestSummary(t *testing.T) {
 			options:       []SummaryOption{ForConditionTypes{"A", "B", "!C"}, NegativePolarityConditionTypes{"!C"}},
 			want: &metav1.Condition{
 				Type:    clusterv1.AvailableV1Beta2Condition,
-				Status:  metav1.ConditionFalse,               // False because there is one issue
-				Reason:  issuesReportedReason,                // Using a generic reason
-				Message: "* !C: No additional info provided", // messages from all the issues & unknown conditions (info dropped); since message is empty, a default one is added
+				Status:  metav1.ConditionFalse, // False because there is one issue
+				Reason:  issuesReportedReason,  // Using a generic reason
+				Message: "* !C: Reason-!C",     // messages from all the issues & unknown conditions (info dropped); since message is empty, a default one is added
 			},
 		},
 		{

Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,7 @@ func (d *defaultMergeStrategy) Merge(conditions []ConditionWithOwnerInfo, condit`
`285`	`285`	`if condition.Message != "" {`
`286`	`286`	`m += indentIfMultiline(condition.Message)`
`287`	`287`	`} else {`
`288`		`- m += " No additional info provided"`
	`288`	`+ m += fmt.Sprintf(" %s", condition.Reason)`
`289`	`289`	`}`
`290`	`290`	`messages = append(messages, m)`
`291`	`291`	`}`