Skip to content

Commit 390c68a

Browse files
Address comments
1 parent 71a233e commit 390c68a

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

api/v1alpha3/condition_consts.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ const (
2828

2929
// Conditions and condition Reasons for the Machine object
3030

31-
// MachineConditionsCount defines the total number of conditions on the Machine object.
32-
const MachineConditionsCount = 2
31+
// MachineSummaryConditionsCount defines the total number of conditions on the Machine object.
32+
const MachineSummaryConditionsCount = 2
3333

3434
const (
3535
// BootstrapReadyCondition reports a summary of current status of the bootstrap object defined for this machine.

controllers/machine_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,9 @@ func (r *MachineReconciler) Reconcile(req ctrl.Request) (_ ctrl.Result, reterr e
169169
defer func() {
170170
// always update the readyCondition with the summary of the machine conditions.
171171
conditions.SetSummary(m,
172-
// we want to surface infrastructure problems as firsts, then the others.
172+
// we want to surface infrastructure problems first, then the others.
173173
conditions.WithConditionOrder(clusterv1.InfrastructureReadyCondition),
174-
conditions.WithStepCounter(clusterv1.MachineConditionsCount),
174+
conditions.WithStepCounter(clusterv1.MachineSummaryConditionsCount),
175175
)
176176

177177
r.reconcilePhase(ctx, m)

controllers/machine_controller_phases.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ func (r *MachineReconciler) reconcileBootstrap(ctx context.Context, cluster *clu
193193
// If the bootstrap data is populated, set ready and return.
194194
if m.Spec.Bootstrap.DataSecretName != nil {
195195
m.Status.BootstrapReady = true
196+
conditions.MarkTrue(m, clusterv1.BootstrapReadyCondition)
196197
return nil
197198
}
198199

0 commit comments

Comments
 (0)