Fix replica counters for cluster

fabriziopandini · fabriziopandini · commit 5955711400ea · 2024-11-15T17:09:50.000+01:00
diff --git a/cmd/clusterctl/cmd/describe_cluster.go b/cmd/clusterctl/cmd/describe_cluster.go
@@ -582,7 +582,7 @@ func newV1beta2RowDescriptor(obj ctrlclient.Object) v1beta2RowDescriptor {
 				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))
+				v.replicas = fmt.Sprintf("%d/%d", ptr.Deref(cp.Replicas, 0)+ptr.Deref(w.Replicas, 0), ptr.Deref(cp.DesiredReplicas, 0)+ptr.Deref(w.DesiredReplicas, 0))
 			}
 			if cp.AvailableReplicas != nil || w.AvailableReplicas != nil {
 				v.availableCounters = fmt.Sprintf("%d", ptr.Deref(cp.AvailableReplicas, 0)+ptr.Deref(w.AvailableReplicas, 0))

Original file line number	Diff line number	Diff line change
`@@ -582,7 +582,7 @@ func newV1beta2RowDescriptor(obj ctrlclient.Object) v1beta2RowDescriptor {`
`582`	`582`	`w = &clusterv1.WorkersStatus{}`
`583`	`583`	`}`
`584`	`584`	`if cp.DesiredReplicas != nil \|\| w.DesiredReplicas != nil \|\| cp.Replicas != nil \|\| w.Replicas != nil {`
`585`		`- 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))`
	`585`	`+ v.replicas = fmt.Sprintf("%d/%d", ptr.Deref(cp.Replicas, 0)+ptr.Deref(w.Replicas, 0), ptr.Deref(cp.DesiredReplicas, 0)+ptr.Deref(w.DesiredReplicas, 0))`
`586`	`586`	`}`
`587`	`587`	`if cp.AvailableReplicas != nil \|\| w.AvailableReplicas != nil {`
`588`	`588`	`v.availableCounters = fmt.Sprintf("%d", ptr.Deref(cp.AvailableReplicas, 0)+ptr.Deref(w.AvailableReplicas, 0))`