Merge pull request #8202 from killianmuldoon/pr-exvars-update-error

k8s-ci-robot · web-flow · commit ccefd0c7bb2e · 2023-02-28T12:03:17.000-08:00
🌱 Clarify condition message for unreconciled clusterclass
diff --git a/internal/controllers/topology/cluster/conditions.go b/internal/controllers/topology/cluster/conditions.go
@@ -69,7 +69,7 @@ func (r *Reconciler) reconcileTopologyReconciledCondition(s *scope.Scope, cluste
 				clusterv1.TopologyReconciledCondition,
 				clusterv1.TopologyReconciledClusterClassNotReconciledReason,
 				clusterv1.ConditionSeverityInfo,
-				"ClusterClass is outdated. If this condition persists please check ClusterClass status.",
+				"ClusterClass not reconciled. If this condition persists please check ClusterClass status.",
 			),
 		)
 		return nil
diff --git a/internal/controllers/topology/cluster/conditions_test.go b/internal/controllers/topology/cluster/conditions_test.go
@@ -69,7 +69,7 @@ func TestReconcileTopologyReconciledCondition(t *testing.T) {
 			},
 			wantConditionStatus:  corev1.ConditionFalse,
 			wantConditionReason:  clusterv1.TopologyReconciledClusterClassNotReconciledReason,
-			wantConditionMessage: "ClusterClass is outdated. If this condition persists please check ClusterClass status.",
+			wantConditionMessage: "ClusterClass not reconciled. If this condition persists please check ClusterClass status.",
 			wantErr:              false,
 		},
 		{

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ func (r Reconciler) reconcileTopologyReconciledCondition(s scope.Scope, cluste`
`69`	`69`	`clusterv1.TopologyReconciledCondition,`
`70`	`70`	`clusterv1.TopologyReconciledClusterClassNotReconciledReason,`
`71`	`71`	`clusterv1.ConditionSeverityInfo,`
`72`		`- "ClusterClass is outdated. If this condition persists please check ClusterClass status.",`
	`72`	`+ "ClusterClass not reconciled. If this condition persists please check ClusterClass status.",`
`73`	`73`	`),`
`74`	`74`	`)`
`75`	`75`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ func TestReconcileTopologyReconciledCondition(t *testing.T) {`
`69`	`69`	`},`
`70`	`70`	`wantConditionStatus: corev1.ConditionFalse,`
`71`	`71`	`wantConditionReason: clusterv1.TopologyReconciledClusterClassNotReconciledReason,`
`72`		`- wantConditionMessage: "ClusterClass is outdated. If this condition persists please check ClusterClass status.",`
	`72`	`+ wantConditionMessage: "ClusterClass not reconciled. If this condition persists please check ClusterClass status.",`
`73`	`73`	`wantErr: false,`
`74`	`74`	`},`
`75`	`75`	`{`