Skip to content

Commit

Permalink
Don't swallow errors when reconciling noderef (kubernetes-sigs#1117)
Browse files Browse the repository at this point in the history
Signed-off-by: Pires <pjpires@gmail.com>
  • Loading branch information
pires authored and k8s-ci-robot committed Jul 5, 2019
1 parent 61ad9c2 commit 76ad211
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions pkg/controller/noderef/noderef_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,14 @@ func (r *ReconcileNodeRef) Reconcile(request reconcile.Request) (reconcile.Resul

result, err := r.reconcile(ctx, cluster, machine)
if err != nil {
if err == ErrNodeNotFound {
klog.Warningf("Failed to assign NodeRef to Machine %q: cannot find a matching Node in namespace %q, retrying later", machine.Name, machine.Namespace)
return reconcile.Result{RequeueAfter: 10 * time.Second}, nil
}

klog.Errorf("Failed to assign NodeRef to Machine %q: %v", request.NamespacedName, err)
r.recorder.Event(machine, apicorev1.EventTypeWarning, "FailedSetNodeRef", err.Error())
return result, err
return reconcile.Result{}, err
}

klog.Infof("Set Machine's (%q in namespace %q) NodeRef to %q", machine.Name, machine.Namespace, machine.Status.NodeRef.Name)
Expand All @@ -164,10 +169,6 @@ func (r *ReconcileNodeRef) reconcile(ctx context.Context, cluster *v1alpha2.Clus
// Get the Node reference.
nodeRef, err := r.getNodeReference(corev1Client, providerID)
if err != nil {
if err == ErrNodeNotFound {
klog.Warningf("Cannot find a matching Node for Machine %q in namespace %q, retrying later", machine.Name, machine.Namespace)
return reconcile.Result{RequeueAfter: 10 * time.Second}, nil
}
return reconcile.Result{}, err
}

Expand Down

0 comments on commit 76ad211

Please sign in to comment.