Skip to content

Commit e90e266

Browse files
authored
Merge pull request kubernetes-sigs#9400 from killianmuldoon/pr-improve-topologyreconciled-message
🌱 Improve message for TopologyReconciledCondition
2 parents ea41d21 + 18fb998 commit e90e266

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

internal/controllers/topology/cluster/conditions.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ func (r *Reconciler) reconcileTopologyReconciledCondition(s *scope.Scope, cluste
8383
clusterv1.TopologyReconciledCondition,
8484
clusterv1.TopologyReconciledClusterClassNotReconciledReason,
8585
clusterv1.ConditionSeverityInfo,
86-
"ClusterClass not reconciled. If this condition persists please check ClusterClass status.",
86+
"ClusterClass not reconciled. If this condition persists please check ClusterClass status. A ClusterClass is reconciled if"+
87+
".status.observedGeneration == .metadata.generation is true. If this is not the case either ClusterClass reconciliation failed or the ClusterClass is paused",
8788
),
8889
)
8990
return nil

internal/controllers/topology/cluster/conditions_test.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,11 @@ func TestReconcileTopologyReconciledCondition(t *testing.T) {
7676
},
7777
},
7878
},
79-
wantConditionStatus: corev1.ConditionFalse,
80-
wantConditionReason: clusterv1.TopologyReconciledClusterClassNotReconciledReason,
81-
wantConditionMessage: "ClusterClass not reconciled. If this condition persists please check ClusterClass status.",
82-
wantErr: false,
79+
wantConditionStatus: corev1.ConditionFalse,
80+
wantConditionReason: clusterv1.TopologyReconciledClusterClassNotReconciledReason,
81+
wantConditionMessage: "ClusterClass not reconciled. If this condition persists please check ClusterClass status. A ClusterClass is reconciled if" +
82+
".status.observedGeneration == .metadata.generation is true. If this is not the case either ClusterClass reconciliation failed or the ClusterClass is paused",
83+
wantErr: false,
8384
},
8485
{
8586
name: "should set the condition to false if the there is a blocking hook",

0 commit comments

Comments
 (0)