Skip to content

Commit f4b6682

Browse files
committed
Improve CC RefVersionsUpToDate condition message
Signed-off-by: Stefan Büringer buringerst@vmware.com
1 parent a21ffb0 commit f4b6682

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

internal/controllers/clusterclass/clusterclass_controller_status.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,12 @@ func setRefVersionsUpToDateCondition(_ context.Context, clusterClass *clusterv1.
5050
}
5151

5252
if len(outdatedRefs) > 0 {
53-
var msg []string
53+
var msg = []string{
54+
"The following templateRefs are not using the latest apiVersion:",
55+
}
5456
for _, outdatedRef := range outdatedRefs {
55-
msg = append(msg, fmt.Sprintf("* templateRef %q should be %q", refString(outdatedRef.Outdated), refString(outdatedRef.UpToDate)))
57+
msg = append(msg, fmt.Sprintf("* %s %s: used: %s, available: %s", outdatedRef.Outdated.Kind, outdatedRef.Outdated.Name,
58+
outdatedRef.Outdated.GroupVersionKind().Version, outdatedRef.UpToDate.GroupVersionKind().Version))
5659
}
5760
v1beta1conditions.Set(clusterClass,
5861
v1beta1conditions.FalseCondition(

internal/controllers/clusterclass/clusterclass_controller_status_test.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,9 @@ func TestSetRefVersionsUpToDateCondition(t *testing.T) {
8181
Type: clusterv1.ClusterClassRefVersionsUpToDateCondition,
8282
Status: metav1.ConditionFalse,
8383
Reason: clusterv1.ClusterClassRefVersionsNotUpToDateReason,
84-
Message: "* templateRef \"controlplane.cluster.x-k8s.io/v1beta2, Kind=KubeadmControlPlaneTemplate default/test-kcp\" should be " +
85-
"\"controlplane.cluster.x-k8s.io/v99, Kind=KubeadmControlPlaneTemplate default/test-kcp\"\n" +
86-
"* templateRef \"infrastructure.cluster.x-k8s.io/v1beta2, Kind=DockerMachineTemplate default/test-dmt\" should be " +
87-
"\"infrastructure.cluster.x-k8s.io/v99, Kind=DockerMachineTemplate default/test-dmt\"",
84+
Message: "The following templateRefs are not using the latest apiVersion:\n" +
85+
"* KubeadmControlPlaneTemplate test-kcp: used: v1beta2, available: v99\n" +
86+
"* DockerMachineTemplate test-dmt: used: v1beta2, available: v99",
8887
},
8988
},
9089
{

0 commit comments

Comments
 (0)