Complete update status

Author: fabriziopandini

api/v1beta1/machine_types.go

@@ -135,8 +135,8 @@ const (
 	// MachineBootstrapDataSecretDataSecretUserProvidedV1Beta2Reason surfaces when a bootstrap data secret is provided by the user (without a ConfigRef).
 	MachineBootstrapDataSecretDataSecretUserProvidedV1Beta2Reason = "DataSecretUserProvided"
 
-	// MachineBootstrapInvalidConfigV1Beta2Reason surfaces when MachineBootstrap doesn't have the Boostrap.ConfigRef nor a
-	// Bootstrap.DataSecretName specified by the users.
+	// MachineBootstrapInvalidConfigV1Beta2Reason surfaces when Machine's spec.bootstrap doesn't have configRef nor a
+	// dataSecretName set.
 	MachineBootstrapInvalidConfigV1Beta2Reason = "InvalidConfig"
 
 	// MachineBootstrapConfigInvalidConditionReportedV1Beta2Reason surfaces a BootstrapConfig Ready condition (read from a bootstrap config object) which is invalid.
@@ -146,9 +146,12 @@ const (
 	// MachineBootstrapConfigReadyNoV1Beta2ReasonReported applies to a BootstrapConfig Ready condition (read from a bootstrap config object) that reports no reason.
 	MachineBootstrapConfigReadyNoV1Beta2ReasonReported = NoV1Beta2ReasonReported
 
-	// MachineBootstrapConfigNotFoundV1Beta2Reason surfaces when a referenced bootstrap config object cannot be found.
+	// MachineBootstrapConfigInternalErrorV1Beta2Reason surfaces unexpected failures when reading a BootstrapConfig object.
+	MachineBootstrapConfigInternalErrorV1Beta2Reason = InternalErrorV1Beta2Reason
+
+	// MachineBootstrapConfigDoesNotExistV1Beta2Reason surfaces when a referenced bootstrap config object does not exist.
 	// Note: this could happen when creating the machine. However, this state should be treated as an error if it last indefinitely.
-	MachineBootstrapConfigNotFoundV1Beta2Reason = RefObjectNotFoundV1Beta2Reason
+	MachineBootstrapConfigDoesNotExistV1Beta2Reason = RefObjectDoesNotExistV1Beta2Reason
 
 	// MachineBootstrapConfigDeletedV1Beta2Reason surfaces when a referenced bootstrap config object has been deleted.
 	// Note: controllers can't identify if the deletion process has been initiated by the controller itself, e.g.
@@ -169,9 +172,12 @@ const (
 	// MachineInfrastructureReadyNoV1Beta2ReasonReported applies to a infrastructure Ready condition (read from an infra machine object) that reports no reason.
 	MachineInfrastructureReadyNoV1Beta2ReasonReported = NoV1Beta2ReasonReported
 
-	// MachineInfrastructureNotFoundV1Beta2Reason surfaces when a referenced infrastructure object cannot be found.
+	// MachineInfrastructureInternalErrorV1Beta2Reason surfaces unexpected failures when reading a BootstrapConfig object.
+	MachineInfrastructureInternalErrorV1Beta2Reason = InternalErrorV1Beta2Reason
+
+	// MachineInfrastructureDoesNotExistV1Beta2Reason surfaces when a referenced infrastructure object does not exist.
 	// Note: this could happen when creating the machine. However, this state should be treated as an error if it last indefinitely.
-	MachineInfrastructureNotFoundV1Beta2Reason = RefObjectNotFoundV1Beta2Reason
+	MachineInfrastructureDoesNotExistV1Beta2Reason = RefObjectDoesNotExistV1Beta2Reason
 
 	// MachineInfrastructureDeletedV1Beta2Reason surfaces when a referenced infrastructure object has been deleted.
 	// Note: controllers can't identify if the deletion process has been initiated by the controller itself, e.g.
@@ -188,6 +194,9 @@ const (
 	// MachineNodeReadyV1Beta2Condition is true if the Machine's Node is ready.
 	MachineNodeReadyV1Beta2Condition = "NodeReady"
 
+	// MachineNodeConditionNotYetReportedV1Beta2Reason surfaces when a Machine's Node doesn't have a condition reported yet.
+	MachineNodeConditionNotYetReportedV1Beta2Reason = "NodeConditionNotYetReported"
+
 	// MachineNodeNotFoundV1Beta2Reason surfaces when the node hosted on the machine cannot be found.
 	// Note: this could happen when creating the machine. However, this state should be treated as an error if it last indefinitely.
 	MachineNodeNotFoundV1Beta2Reason = "NodeNotFound"
@@ -220,6 +229,12 @@ const (
 const (
 	// MachinePausedV1Beta2Condition is true if the Machine or the Cluster it belongs to are paused.
 	MachinePausedV1Beta2Condition = PausedV1Beta2Condition
+
+	// MachineNotPausedV1Beta2Reason surfaces when a Machine is not paused.
+	MachineNotPausedV1Beta2Reason = NotPausedV1Beta2Reason
+
+	// MachineObjectPausedV1Beta2Reason surfaces when a Machine is paused.
+	MachineObjectPausedV1Beta2Reason = ObjectPausedV1Beta2Reason
 )
 
 // ANCHOR: MachineSpec

api/v1beta1/v1beta2_condition_consts.go

@@ -95,13 +95,26 @@ const (
 	// Note: this could happen e.g. when an external object still uses Cluster API v1beta1 Conditions.
 	NoV1Beta2ReasonReported = "NoReasonReported"
 
-	// RefObjectNotFoundV1Beta2Reason surfaces when a referenced object cannot be found.
-	RefObjectNotFoundV1Beta2Reason = "RefObjectNotFound"
+	// InternalErrorV1Beta2Reason surfaces unexpected errors reporting by controllers.
+	// In most cases, it will be required to look at controllers logs to proper triage those issues.
+	InternalErrorV1Beta2Reason = "InternalError"
+
+	// RefObjectDoesNotExistV1Beta2Reason surfaces when a referenced object does not exist.
+	RefObjectDoesNotExistV1Beta2Reason = "RefObjectDoesNotExist"
 
 	// RefObjectDeletedV1Beta2Reason surfaces when a referenced object has been deleted.
 	// Note: controllers can't identify if the deletion process has been initiated by the controller itself, e.g.
 	// during the deletion workflow, or by a users.
 	RefObjectDeletedV1Beta2Reason = "RefObjectDeleted"
+
+	// NotPausedV1Beta2Reason surfaces when an object is not paused.
+	NotPausedV1Beta2Reason = "NotPaused"
+
+	// ClusterPausedV1Beta2Reason surfaces when an Cluster is paused.
+	ClusterPausedV1Beta2Reason = "ClusterPaused"
+
+	// ObjectPausedV1Beta2Reason surfaces when an object is paused.
+	ObjectPausedV1Beta2Reason = "ObjectPaused"
 )
 
 // Conditions that will be used for the MachineSet object in v1Beta2 API version.

internal/controllers/machine/machine_controller.go

@@ -189,17 +189,17 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Re
 			m.Spec.ClusterName, m.Name, m.Namespace)
 	}
 
-	// Return early if the object or Cluster is paused.
-	if annotations.IsPaused(cluster, m) {
-		log.Info("Reconciliation is paused for this object")
-		return ctrl.Result{}, nil
-	}
-
 	s := &scope{
 		cluster: cluster,
 		machine: m,
 	}
 
+	// Return early if the object or Cluster is paused.
+	if annotations.IsPaused(cluster, m) {
+		log.Info("Reconciliation is paused for this object")
+		return ctrl.Result{}, setPausedCondition(ctx, r.Client, s)
+	}
+
 	// Initialize the patch helper
 	patchHelper, err := patch.NewHelper(m, r.Client)
 	if err != nil {