More work

Author: fabriziopandini

cmd/clusterctl/cmd/describe_cluster.go

@@ -34,6 +34,7 @@ import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/util/duration"
 	"k8s.io/apimachinery/pkg/util/sets"
+	"k8s.io/utils/ptr"
 	ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
 
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
@@ -269,6 +270,14 @@ 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 condition picked from the object line
+	if tree.IsShowConditionsObject(obj) {
+		rowDescriptor.status = ""
+		rowDescriptor.reason = ""
+		rowDescriptor.age = ""
+		rowDescriptor.message = ""
+	}
+
 	// Add the row representing the object that includes
 	// - The row name with the tree view prefix.
 	// - The object's available condition + counters
@@ -510,8 +519,37 @@ func newV1beta2RowDescriptor(obj ctrlclient.Object) v1beta2RowDescriptor {
 	v := v1beta2RowDescriptor{}
 	switch t := obj.(type) {
 	case *clusterv1.Cluster:
-		fmt.Printf("This is a cluster!")
+		c := obj.(*clusterv1.Cluster)
+		if c.Status.V1Beta2 != nil {
+			cp := c.Status.V1Beta2.ControlPlane
+			if cp == nil {
+				cp = &clusterv1.ClusterControlPlaneStatus{}
+			}
+			w := c.Status.V1Beta2.Workers
+			if w == nil {
+				w = &clusterv1.WorkersStatus{}
+			}
+			if cp.DesiredReplicas != nil || w.DesiredReplicas != nil || cp.Replicas != nil || w.Replicas != nil {
+				v.replicas = fmt.Sprintf("%d/%d", ptr.Deref(cp.DesiredReplicas, 0)+ptr.Deref(w.DesiredReplicas, 0), ptr.Deref(cp.Replicas, 0)+ptr.Deref(w.Replicas, 0))
+			}
+			if cp.AvailableReplicas != nil || w.AvailableReplicas != nil {
+				v.availableCounters = fmt.Sprintf("%d", ptr.Deref(cp.AvailableReplicas, 0)+ptr.Deref(w.AvailableReplicas, 0))
+			}
+			if cp.ReadyReplicas != nil || w.ReadyReplicas != nil {
+				v.readyCounters = fmt.Sprintf("%d", ptr.Deref(cp.ReadyReplicas, 0)+ptr.Deref(w.ReadyReplicas, 0))
+			}
+			if cp.UpToDateReplicas != nil || w.UpToDateReplicas != nil {
+				v.upToDateCounters = fmt.Sprintf("%d", ptr.Deref(cp.UpToDateReplicas, 0)+ptr.Deref(w.UpToDateReplicas, 0))
+			}
+		}
 
+		if available := tree.GetAvailableV1Beta2Condition(obj); available != nil {
+			availableColor, availableStatus, availableAge, availableReason, availableMessage := v1Beta2ConditionInfo(*available, true)
+			v.status = availableColor.Sprintf("Available: %s", availableStatus)
+			v.reason = availableColor.Sprint(availableReason)
+			v.age = availableColor.Sprint(availableAge)
+			v.message = availableColor.Sprint(availableMessage)
+		}
 	case *clusterv1.MachineDeployment:
 		md := obj.(*clusterv1.MachineDeployment)
 		if md.Spec.Replicas != nil {