Address comments

Author: fabriziopandini

cmd/clusterctl/client/tree/tree.go

@@ -265,18 +265,22 @@ func (od ObjectTree) GetObjectsByParent(id types.UID) []client.Object {
 }
 
 func hasSameAvailableReadyUptoDateStatusAndReason(availableA, availableB, readyA, readyB, upToDateA, upToDateB *metav1.Condition) bool {
-	if ((availableA == nil) != (availableB == nil)) || ((availableA != nil && availableB != nil) && (availableA.Status != availableB.Status || availableA.Reason != availableB.Reason)) {
+	if !hasSameStatusAndReason(availableA, availableB) {
 		return false
 	}
-
-	if ((readyA == nil) != (readyB == nil)) || ((readyA != nil && readyB != nil) && (readyA.Status != readyB.Status || readyA.Reason != readyB.Reason)) {
+	if !hasSameStatusAndReason(readyA, readyB) {
 		return false
 	}
-
-	if ((upToDateA == nil) != (upToDateB == nil)) || ((upToDateA != nil && upToDateB != nil) && (upToDateA.Status != upToDateB.Status || upToDateA.Reason != upToDateB.Reason)) {
+	if !hasSameStatusAndReason(upToDateA, upToDateB) {
 		return false
 	}
+	return true
+}
 
+func hasSameStatusAndReason(a, b *metav1.Condition) bool {
+	if ((a == nil) != (b == nil)) || ((a != nil && b != nil) && (a.Status != b.Status || a.Reason != b.Reason)) {
+		return false
+	}
 	return true
 }
 

cmd/clusterctl/client/tree/util.go

@@ -53,10 +53,20 @@ func GetAvailableV1Beta2Condition(obj client.Object) *metav1.Condition {
 	if getter, ok := obj.(v1beta2conditions.Getter); ok {
 		return v1beta2conditions.Get(getter, clusterv1.AvailableV1Beta2Condition)
 	}
+
+	if objUnstructured, ok := obj.(*unstructured.Unstructured); ok {
+		c, err := v1beta2conditions.UnstructuredGet(objUnstructured, clusterv1.AvailableV1Beta2Condition)
+		if err != nil {
+			return nil
+		}
+		return c
+	}
+
 	return nil
 }
 
 // GetMachineUpToDateV1Beta2Condition returns machine's UpToDate condition, if defined.
+// Note: The UpToDate condition only exist on machines, so no need to support reading from unstructured.
 func GetMachineUpToDateV1Beta2Condition(obj client.Object) *metav1.Condition {
 	if getter, ok := obj.(v1beta2conditions.Getter); ok {
 		return v1beta2conditions.Get(getter, clusterv1.MachineUpToDateV1Beta2Condition)

cmd/clusterctl/cmd/describe_cluster.go

@@ -274,7 +274,7 @@ func addObjectRowV1Beta2(prefix string, tbl *tablewriter.Table, objectTree *tree
 	// NOTE: The object name gets manipulated in order to improve readability.
 	name := getRowName(obj)
 
-	// If we are going to should all conditions from this object, let's drop the condition picked in the rowDescriptor.
+	// If we are going to show all conditions from this object, let's drop the condition picked in the rowDescriptor.
 	if tree.IsShowConditionsObject(obj) {
 		rowDescriptor.status = ""
 		rowDescriptor.reason = ""