Skip to content

Commit e7fb17b

Browse files
committed
remove hardcoded condition
1 parent d6d3d1f commit e7fb17b

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

controlplane/kubeadm/internal/controllers/controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ func (r *KubeadmControlPlaneReconciler) reconcile(ctx context.Context, controlPl
375375

376376
// Aggregate the operational state of all the machines; while aggregating we are adding the
377377
// source ref (reason@machine/name) so the problem can be easily tracked down to its source machine.
378-
conditions.SetAggregate(controlPlane.KCP, controlplanev1.MachinesReadyCondition, controlPlane.Machines.ConditionGetters(), conditions.AddSourceRef(), conditions.WithStepCounterIf(false))
378+
conditions.SetAggregate(controlPlane.KCP, controlplanev1.MachinesReadyCondition, controlPlane.Machines.ConditionGetters(), conditions.AddSourceRef())
379379

380380
// Updates conditions reporting the status of static pods and the status of the etcd cluster.
381381
// NOTE: Conditions reporting KCP operation progress like e.g. Resized or SpecUpToDate are inlined with the rest of the execution.
@@ -528,7 +528,7 @@ func (r *KubeadmControlPlaneReconciler) reconcileDelete(ctx context.Context, con
528528
// source ref (reason@machine/name) so the problem can be easily tracked down to its source machine.
529529
// However, during delete we are hiding the counter (1 of x) because it does not make sense given that
530530
// all the machines are deleted in parallel.
531-
conditions.SetAggregate(controlPlane.KCP, controlplanev1.MachinesReadyCondition, controlPlane.Machines.ConditionGetters(), conditions.AddSourceRef(), conditions.WithStepCounterIf(false))
531+
conditions.SetAggregate(controlPlane.KCP, controlplanev1.MachinesReadyCondition, controlPlane.Machines.ConditionGetters(), conditions.AddSourceRef())
532532

533533
// Gets all machines, not just control plane machines.
534534
allMachines, err := r.managementCluster.GetMachinesForCluster(ctx, controlPlane.Cluster)

internal/controllers/machineset/machineset_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -942,7 +942,7 @@ func (r *Reconciler) updateStatus(ctx context.Context, cluster *clusterv1.Cluste
942942

943943
// Aggregate the operational state of all the machines; while aggregating we are adding the
944944
// source ref (reason@machine/name) so the problem can be easily tracked down to its source machine.
945-
conditions.SetAggregate(ms, clusterv1.MachinesReadyCondition, collections.FromMachines(filteredMachines...).ConditionGetters(), conditions.AddSourceRef(), conditions.WithStepCounterIf(false))
945+
conditions.SetAggregate(ms, clusterv1.MachinesReadyCondition, collections.FromMachines(filteredMachines...).ConditionGetters(), conditions.AddSourceRef())
946946

947947
return nil
948948
}

0 commit comments

Comments
 (0)