Skip to content

Commit

Permalink
Merge pull request kubernetes-sigs#207 from detiber/noRequeue
Browse files Browse the repository at this point in the history
Do not requeue while waiting for watched resources
  • Loading branch information
k8s-ci-robot authored Aug 20, 2019
2 parents 3e4446f + 529bbb9 commit 4e2ce55
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions controllers/dockermachine_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ func (r *DockerMachineReconciler) Reconcile(req ctrl.Request) (_ ctrl.Result, re
}
if machine == nil {
log.Info("Waiting for Machine Controller to set OwnerRef on DockerMachine")
return ctrl.Result{RequeueAfter: 10 * time.Second}, nil
return ctrl.Result{}, nil
}

// Get the Cluster API Cluster
Expand All @@ -80,7 +80,7 @@ func (r *DockerMachineReconciler) Reconcile(req ctrl.Request) (_ ctrl.Result, re
}
if cluster == nil {
log.Info(fmt.Sprintf("Please associate this machine with a cluster using the label %s: <name of cluster>", clusterv1.MachineClusterLabelName))
return ctrl.Result{RequeueAfter: 30 * time.Second}, nil
return ctrl.Result{}, nil
}

// Initialize the patch helper
Expand Down Expand Up @@ -113,7 +113,7 @@ func (r *DockerMachineReconciler) Reconcile(req ctrl.Request) (_ ctrl.Result, re
return ctrl.Result{}, nil
case Pending:
log.Info("Waiting for machine bootstrap")
return ctrl.Result{RequeueAfter: 10 * time.Second}, nil
return ctrl.Result{}, nil
case Provisioning:
log.Info("Provisioning machine")
// Ensuring cluster is ready for joining
Expand Down

0 comments on commit 4e2ce55

Please sign in to comment.