Skip to content

Commit

Permalink
Merge pull request #2740 from vincepri/actually-return
Browse files Browse the repository at this point in the history
🐛 MachineDeployment controller should actually return errors
  • Loading branch information
k8s-ci-robot authored Mar 20, 2020
2 parents a97903f + 83bf04e commit e0c232b
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions controllers/machinedeployment_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,7 @@ func (r *MachineDeploymentReconciler) Reconcile(req ctrl.Request) (_ ctrl.Result
logger.Error(err, "Failed to reconcile MachineDeployment")
r.recorder.Eventf(deployment, corev1.EventTypeWarning, "ReconcileError", "%v", err)
}

return result, nil
return result, err
}

func (r *MachineDeploymentReconciler) reconcile(ctx context.Context, cluster *clusterv1.Cluster, d *clusterv1.MachineDeployment) (ctrl.Result, error) {
Expand Down

0 comments on commit e0c232b

Please sign in to comment.