address comments

Author: fabriziopandini

api/v1alpha3/condition_consts.go

@@ -76,6 +76,16 @@ const (
 	// to be available.
 	// NOTE: This reason is used only as a fallback when the bootstrap object is not reporting its own ready condition.
 	WaitingForDataSecretFallbackReason = "WaitingForDataSecret"
+
+	// DrainingSucceededCondition provide evidence of the status of the node drain operation which happens during the machine
+	// deletion process.
+	DrainingSucceededCondition ConditionType = "BootstrapReady"
+
+	// DrainingReason (Severity=Info) documents a machine node being drained.
+	DrainingReason = "Draining"
+
+	// DrainingFailedReason (Severity=Warning) documents a machine node drain operation failed.
+	DrainingFailedReason = "DrainingFailed"
 )
 
 const (

controllers/machine_controller.go

@@ -302,18 +302,18 @@ func (r *MachineReconciler) reconcileDelete(ctx context.Context, cluster *cluste
 			}
 
 			logger.Info("Draining node", "node", m.Status.NodeRef.Name)
-			conditions.MarkFalse(m, "DrainingSucceeded", "Draining", clusterv1.ConditionSeverityInfo, "Draining the node before deletion")
+			conditions.MarkFalse(m, clusterv1.DrainingSucceededCondition, "Draining", clusterv1.DrainingReason, "Draining the node before deletion")
 			if err := patchMachine(ctx, patchHelper, m); err != nil {
 				return ctrl.Result{}, errors.Wrap(err, "failed to patch Machine")
 			}
 
 			if err := r.drainNode(ctx, cluster, m.Status.NodeRef.Name, m.Name); err != nil {
-				conditions.MarkFalse(m, "DrainingSucceeded", "DrainingError", clusterv1.ConditionSeverityWarning, err.Error())
+				conditions.MarkFalse(m, clusterv1.DrainingSucceededCondition, clusterv1.DrainingFailedReason, clusterv1.ConditionSeverityWarning, err.Error())
 				r.recorder.Eventf(m, corev1.EventTypeWarning, "FailedDrainNode", "error draining Machine's node %q: %v", m.Status.NodeRef.Name, err)
 				return ctrl.Result{}, err
 			}
 
-			conditions.MarkTrue(m, "DrainingSucceeded")
+			conditions.MarkTrue(m, clusterv1.DrainingSucceededCondition)
 			r.recorder.Eventf(m, corev1.EventTypeNormal, "SuccessfulDrainNode", "success draining Machine's node %q", m.Status.NodeRef.Name)
 		}
 	}

test/infrastructure/docker/controllers/dockermachine_controller.go

@@ -264,7 +264,7 @@ func (r *DockerMachineReconciler) reconcileNormal(ctx context.Context, machine *
 	if !conditions.Has(dockerMachine, infrav1.BootstrapExecSucceededCondition) {
 		conditions.MarkFalse(dockerMachine, infrav1.BootstrapExecSucceededCondition, infrav1.BootstrappingReason, clusterv1.ConditionSeverityInfo, "")
 		if err := patchDockerMachine(ctx, patchHelper, dockerMachine); err != nil {
-			return ctrl.Result{}, errors.Wrap(err, "failed to patch MockerMachine")
+			return ctrl.Result{}, errors.Wrap(err, "failed to patch DockerMachine")
 		}
 	}
 
@@ -338,7 +338,7 @@ func (r *DockerMachineReconciler) reconcileDelete(ctx context.Context, machine *
 	}
 	conditions.MarkFalse(dockerMachine, infrav1.ContainerProvisionedCondition, clusterv1.DeletingReason, clusterv1.ConditionSeverityInfo, "")
 	if err := patchDockerMachine(ctx, patchHelper, dockerMachine); err != nil {
-		return ctrl.Result{}, errors.Wrap(err, "failed to patch D ockerMachine")
+		return ctrl.Result{}, errors.Wrap(err, "failed to patch DockerMachine")
 	}
 
 	// delete the machine