Allow machine controller to function without the need of a cluster object. (#644)

Author: Maisem Ali

pkg/controller/machine/controller.go

@@ -113,6 +113,13 @@ func (r *ReconcileMachine) Reconcile(request reconcile.Request) (reconcile.Resul
 	name := m.Name
 	klog.Infof("Running reconcile Machine for %s\n", name)
 
+	// Cluster might be nil as some providers might not require a cluster object
+	// for machine management.
+	cluster, err := r.getCluster(ctx, m)
+	if err != nil {
+		// Just log the error here.
+		klog.V(4).Infof("Cluster not found, machine actuation might fail: %v", err)
+	}
 	// If object hasn't been deleted and doesn't have a finalizer, add one
 	// Add a finalizer to newly created objects.
 	if m.ObjectMeta.DeletionTimestamp.IsZero() &&
@@ -138,7 +145,7 @@ func (r *ReconcileMachine) Reconcile(request reconcile.Request) (reconcile.Resul
 			return reconcile.Result{}, nil
 		}
 		klog.Infof("reconciling machine object %v triggers delete.", name)
-		if err := r.delete(ctx, m); err != nil {
+		if err := r.actuator.Delete(ctx, cluster, m); err != nil {
 			klog.Errorf("Error deleting machine object %v; %v", name, err)
 			if requeueErr, ok := err.(*controllerError.RequeueAfterError); ok {
 				klog.Infof("Actuator returned requeue-after error: %v", requeueErr)
@@ -157,19 +164,14 @@ func (r *ReconcileMachine) Reconcile(request reconcile.Request) (reconcile.Resul
 		return reconcile.Result{}, nil
 	}
 
-	cluster, err := r.getCluster(ctx, m)
-	if err != nil {
-		return reconcile.Result{}, err
-	}
-
 	exist, err := r.actuator.Exists(ctx, cluster, m)
 	if err != nil {
 		klog.Errorf("Error checking existence of machine instance for machine object %v; %v", name, err)
 		return reconcile.Result{}, err
 	}
 	if exist {
 		klog.Infof("Reconciling machine object %v triggers idempotent update.", name)
-		if err := r.update(ctx, m); err != nil {
+		if err := r.actuator.Update(ctx, cluster, m); err != nil {
 			if requeueErr, ok := err.(*controllerError.RequeueAfterError); ok {
 				klog.Infof("Actuator returned requeue-after error: %v", requeueErr)
 				return reconcile.Result{Requeue: true, RequeueAfter: requeueErr.RequeueAfter}, nil
@@ -180,7 +182,7 @@ func (r *ReconcileMachine) Reconcile(request reconcile.Request) (reconcile.Resul
 	}
 	// Machine resource created. Machine does not yet exist.
 	klog.Infof("Reconciling machine object %v triggers idempotent create.", m.ObjectMeta.Name)
-	if err := r.create(ctx, m); err != nil {
+	if err := r.actuator.Create(ctx, cluster, m); err != nil {
 		klog.Warningf("unable to create machine %v: %v", name, err)
 		if requeueErr, ok := err.(*controllerError.RequeueAfterError); ok {
 			klog.Infof("Actuator returned requeue-after error: %v", requeueErr)
@@ -191,35 +193,6 @@ func (r *ReconcileMachine) Reconcile(request reconcile.Request) (reconcile.Resul
 	return reconcile.Result{}, nil
 }
 
-func (r *ReconcileMachine) create(ctx context.Context, machine *clusterv1.Machine) error {
-	cluster, err := r.getCluster(ctx, machine)
-	if err != nil {
-		return err
-	}
-
-	return r.actuator.Create(ctx, cluster, machine)
-}
-
-func (r *ReconcileMachine) update(ctx context.Context, new_machine *clusterv1.Machine) error {
-	cluster, err := r.getCluster(ctx, new_machine)
-	if err != nil {
-		return err
-	}
-
-	// TODO: Assume single master for now.
-	// TODO: Assume we never change the role for the machines. (Master->Node, Node->Master, etc)
-	return r.actuator.Update(ctx, cluster, new_machine)
-}
-
-func (r *ReconcileMachine) delete(ctx context.Context, machine *clusterv1.Machine) error {
-	cluster, err := r.getCluster(ctx, machine)
-	if err != nil {
-		return err
-	}
-
-	return r.actuator.Delete(ctx, cluster, machine)
-}
-
 func (r *ReconcileMachine) getCluster(ctx context.Context, machine *clusterv1.Machine) (*clusterv1.Cluster, error) {
 	clusterList := clusterv1.ClusterList{}
 	listOptions := &client.ListOptions{