Merge pull request #7 from Smirl/clean-up-1

Better inline comments and status update in Reconcile

Author: Smirl

controllers/floatingipbinding_controller.go

@@ -56,6 +56,41 @@ type FloatingIPBindingReconciler struct {
 	DigitaloceanToken string
 }
 
+func (r *FloatingIPBindingReconciler) SetupWithManager(mgr ctrl.Manager) error {
+	return ctrl.NewControllerManagedBy(mgr).
+		For(&digitaloceanv1beta1.FloatingIPBinding{}).
+		Watches(
+			&source.Kind{Type: &v1.Node{}},
+			&handler.EnqueueRequestsFromMapFunc{
+				ToRequests: handler.ToRequestsFunc(r.nodeToRequest),
+			},
+		).
+		Complete(r)
+}
+
+func (r *FloatingIPBindingReconciler) nodeToRequest(nodeMapObject handler.MapObject) []reconcile.Request {
+	// Whenever any node every happens reconcile ALL FloatingIPBindings
+	// List all bindings
+	var bindings digitaloceanv1beta1.FloatingIPBindingList
+	err := r.List(context.Background(), &bindings)
+	if err != nil {
+		r.Log.Error(err, "Failed to list floating IP bindings")
+		return []reconcile.Request{}
+	}
+
+	// Convert FloatingIPBindingList to []reconcile.Request
+	var reconcileRequests []reconcile.Request
+	for _, binding := range bindings.Items {
+		reconcileRequests = append(reconcileRequests, reconcile.Request{
+			NamespacedName: types.NamespacedName{
+				Name:      binding.GetName(),
+				Namespace: binding.GetNamespace(),
+			},
+		})
+	}
+	return reconcileRequests
+}
+
 // +kubebuilder:rbac:groups=digitalocean.smirlwebs.com,resources=floatingipbindings,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=digitalocean.smirlwebs.com,resources=floatingipbindings/status,verbs=get;update;patch
 // +kubebuilder:rbac:groups="",resources=nodes,verbs=get;watch;list
@@ -64,13 +99,16 @@ func (r *FloatingIPBindingReconciler) Reconcile(req ctrl.Request) (ctrl.Result,
 	log := r.Log.WithValues("floatingipbinding", req.NamespacedName)
 
 	// Create a digitalocean client
+	// TODO: Move to controller set up
 	client := godo.NewFromToken(r.DigitaloceanToken)
 
+	// Get the FloatingIPBinding from Kubernetes
 	binding, err := r.GetFloatingIPBinding(ctx, log, req.NamespacedName)
 	if err != nil {
 		return ctrl.Result{RequeueAfter: RequeueAfter}, err
 	}
 
+	// Get the best node/droplet to assign to the floating IP
 	droplet, err := r.GetDroplet(ctx, log, client, binding)
 	if err != nil {
 		return ctrl.Result{RequeueAfter: RequeueAfter}, err
@@ -80,52 +118,30 @@ func (r *FloatingIPBindingReconciler) Reconcile(req ctrl.Request) (ctrl.Result,
 		return ctrl.Result{RequeueAfter: RequeueAfter}, err
 	}
 
+	// Assign the droplet to the floating IP if required
 	err = r.AssignFloatingIP(ctx, log, client, binding, droplet)
 	if err != nil {
 		return ctrl.Result{RequeueAfter: RequeueAfter}, err
 	}
 
-	return ctrl.Result{}, nil
-}
-
-func (r *FloatingIPBindingReconciler) SetupWithManager(mgr ctrl.Manager) error {
-	return ctrl.NewControllerManagedBy(mgr).
-		For(&digitaloceanv1beta1.FloatingIPBinding{}).
-		Watches(
-			&source.Kind{Type: &v1.Node{}},
-			&handler.EnqueueRequestsFromMapFunc{
-				ToRequests: handler.ToRequestsFunc(r.nodeToRequest),
-			},
-		).
-		Complete(r)
-}
-
-func (r *FloatingIPBindingReconciler) nodeToRequest(nodeMapObject handler.MapObject) []reconcile.Request {
-
-	var bindings digitaloceanv1beta1.FloatingIPBindingList
-	err := r.List(context.Background(), &bindings)
+	// Update status
+	binding.Status.AssignedDropletID = droplet.ID
+	binding.Status.AssignedDropletName = droplet.Name
+	err = r.Status().Update(ctx, binding)
 	if err != nil {
-		r.Log.Error(err, "Failed to list floating IP bindings")
-		return []reconcile.Request{}
+		log.Error(err, "Failed to update status")
+		return ctrl.Result{RequeueAfter: RequeueAfter}, err
 	}
 
-	var reconcileRequests []reconcile.Request
-	for _, binding := range bindings.Items {
-		reconcileRequests = append(reconcileRequests, reconcile.Request{
-			NamespacedName: types.NamespacedName{
-				Name:      binding.GetName(),
-				Namespace: binding.GetNamespace(),
-			},
-		})
-	}
-	return reconcileRequests
+	return ctrl.Result{}, nil
 }
 
 func (r *FloatingIPBindingReconciler) GetFloatingIPBinding(
 	ctx context.Context,
 	log logr.Logger,
 	name types.NamespacedName,
 ) (*digitaloceanv1beta1.FloatingIPBinding, error) {
+	// Get the FloatingIPBinding from Kubernetes
 	binding := &digitaloceanv1beta1.FloatingIPBinding{}
 	if err := r.Get(ctx, name, binding); err != nil {
 		err = client.IgnoreNotFound(err)
@@ -222,6 +238,7 @@ func (r *FloatingIPBindingReconciler) AssignFloatingIP(
 		return err
 	}
 
+	// Assign droplet to floating IP if not already assigned
 	if ip.Droplet != nil && ip.Droplet.ID == droplet.ID {
 		log.Info("Droplet is already assigned to floatingIP. Skipping.")
 	} else {
@@ -234,13 +251,5 @@ func (r *FloatingIPBindingReconciler) AssignFloatingIP(
 		log.Info("Assigned droplet to FloatingIP")
 	}
 
-	// Update status
-	binding.Status.AssignedDropletID = droplet.ID
-	binding.Status.AssignedDropletName = droplet.Name
-	err = r.Status().Update(ctx, binding)
-	if err != nil {
-		log.Error(err, "Failed to update status")
-		return err
-	}
 	return nil
 }