Address comments

Author: fabriziopandini

controlplane/kubeadm/api/v1beta1/v1beta2_condition_consts.go

@@ -35,9 +35,9 @@ const (
 
 	// KubeadmControlPlaneCertificatesAvailableV1Beta2Reason surfaces when cluster certificates are available,
 	// no matter if those certificates have been provided by the user or generated by  KubeadmControlPlane itself.
-	// Cluster certificates includes: certificates authorities for ca, sa, front-proxy, etcd, and if external etcd is used,
+	// Cluster certificates include: certificate authorities for ca, sa, front-proxy, etcd, and if external etcd is used,
 	// also the apiserver-etcd-client client certificate.
-	KubeadmControlPlaneCertificatesAvailableV1Beta2Reason = clusterv1.AvailableV1Beta2Condition
+	KubeadmControlPlaneCertificatesAvailableV1Beta2Reason = clusterv1.MachineAvailableV1Beta2Reason
 )
 
 // KubeadmControlPlane's EtcdClusterAvailable condition and corresponding reasons that will be used in v1Beta2 API version.
@@ -86,22 +86,19 @@ const (
 	// KubeadmControlPlaneMachineRemediationInternalErrorV1Beta2Reason surfaces unexpected failures while remediation a control plane machine.
 	KubeadmControlPlaneMachineRemediationInternalErrorV1Beta2Reason = clusterv1.InternalErrorV1Beta2Reason
 
-	// KubeadmControlPlaneMachineCannotBeRemediatedV1Beta2Reason surfaces when remediation of a control plane machine can't be completed.
-	KubeadmControlPlaneMachineCannotBeRemediatedV1Beta2Reason = "CannotRemediate"
+	// KubeadmControlPlaneMachineCannotBeRemediatedV1Beta2Reason surfaces when remediation of a control plane machine can't be started.
+	KubeadmControlPlaneMachineCannotBeRemediatedV1Beta2Reason = "CannotBeRemediated"
 
 	// KubeadmControlPlaneMachineRemediationDeferredV1Beta2Reason surfaces when remediation of a control plane machine must be deferred.
 	KubeadmControlPlaneMachineRemediationDeferredV1Beta2Reason = "RemediationDeferred"
 
-	// KubeadmControlPlaneMachineRemediationDoneV1Beta2Reason surfaces when remediation of a control plane machine has been completed.
+	// KubeadmControlPlaneMachineRemediationMachineDeletedV1Beta2Reason surfaces when remediation of a control plane machine
+	// has been completed by deleting the unhealthy machine.
 	// Note: After an unhealthy machine is deleted, a new one is created by the KubeadmControlPlaneMachine as part of the
-	// regular reconcile loop that ensures the correct number of replicas exist; KubeadmControlPlaneMachine waits for
+	// regular reconcile loop that ensures the correct number of replicas exist; KubeadmControlPlane machine waits for
 	// the new machine to exists before removing the controlplane.cluster.x-k8s.io/remediation-in-progress annotation.
 	// This is part of a series of safeguards to ensure that operation are performed sequentially on control plane machines.
-	KubeadmControlPlaneMachineRemediationDoneV1Beta2Reason = "MachineDeleted"
-
-	// KubeadmControlPlaneMachineRemediationDInternalErrorV1Beta2Reason surfaces unexpected failures when remediating
-	// a KubeadmControlPlane controlled machine.
-	KubeadmControlPlaneMachineRemediationDInternalErrorV1Beta2Reason = clusterv1.InternalErrorV1Beta2Reason
+	KubeadmControlPlaneMachineRemediationMachineDeletedV1Beta2Reason = "MachineDeleted"
 )
 
 // KubeadmControlPlane's Deleting condition and corresponding reasons that will be used in v1Beta2 API version.

controlplane/kubeadm/internal/controllers/remediation.go

@@ -77,6 +77,8 @@ func (r *KubeadmControlPlaneReconciler) reconcileUnhealthyMachines(ctx context.C
 
 		if err := patchHelper.Patch(ctx, m, patch.WithOwnedConditions{Conditions: []clusterv1.ConditionType{
 			clusterv1.MachineOwnerRemediatedCondition,
+		}}, patch.WithOwnedV1Beta2Conditions{Conditions: []string{
+			clusterv1.MachineOwnerRemediatedV1Beta2Condition,
 		}}); err != nil {
 			errList = append(errList, err)
 		}
@@ -141,8 +143,6 @@ func (r *KubeadmControlPlaneReconciler) reconcileUnhealthyMachines(ctx context.C
 
 	patchHelper, err := patch.NewHelper(machineToBeRemediated, r.Client)
 	if err != nil {
-		log.Error(err, "failed to create patch helper")
-
 		return ctrl.Result{}, err
 	}
 
@@ -206,7 +206,7 @@ func (r *KubeadmControlPlaneReconciler) reconcileUnhealthyMachines(ctx context.C
 				Type:    clusterv1.MachineOwnerRemediatedV1Beta2Condition,
 				Status:  metav1.ConditionFalse,
 				Reason:  controlplanev1.KubeadmControlPlaneMachineRemediationDeferredV1Beta2Reason,
-				Message: "KCP waiting for control plane machine provisioning to complete before triggering remediation",
+				Message: "KCP waiting for control plane Machine provisioning to complete before triggering remediation",
 			})
 			return ctrl.Result{}, nil
 		}
@@ -220,7 +220,7 @@ func (r *KubeadmControlPlaneReconciler) reconcileUnhealthyMachines(ctx context.C
 				Type:    clusterv1.MachineOwnerRemediatedV1Beta2Condition,
 				Status:  metav1.ConditionFalse,
 				Reason:  controlplanev1.KubeadmControlPlaneMachineRemediationDeferredV1Beta2Reason,
-				Message: "KCP waiting for control plane machine deletion to complete before triggering remediation",
+				Message: "KCP waiting for control plane Machine deletion to complete before triggering remediation",
 			})
 			return ctrl.Result{}, nil
 		}
@@ -248,7 +248,7 @@ func (r *KubeadmControlPlaneReconciler) reconcileUnhealthyMachines(ctx context.C
 					Type:    clusterv1.MachineOwnerRemediatedV1Beta2Condition,
 					Status:  metav1.ConditionFalse,
 					Reason:  controlplanev1.KubeadmControlPlaneMachineCannotBeRemediatedV1Beta2Reason,
-					Message: "KCP can't remediate this machine because this could result in etcd loosing quorum",
+					Message: "KCP can't remediate this Machine because this could result in etcd loosing quorum",
 				})
 				return ctrl.Result{}, nil
 			}
@@ -279,7 +279,7 @@ func (r *KubeadmControlPlaneReconciler) reconcileUnhealthyMachines(ctx context.C
 					Type:    clusterv1.MachineOwnerRemediatedV1Beta2Condition,
 					Status:  metav1.ConditionFalse,
 					Reason:  controlplanev1.KubeadmControlPlaneMachineCannotBeRemediatedV1Beta2Reason,
-					Message: "KCP can't remediate this machine because there is no healthy machine to forward etcd leadership to",
+					Message: "KCP can't remediate this Machine because there is no healthy Machine to forward etcd leadership to",
 				})
 				return ctrl.Result{}, nil
 			}
@@ -320,7 +320,7 @@ func (r *KubeadmControlPlaneReconciler) reconcileUnhealthyMachines(ctx context.C
 	v1beta2conditions.Set(machineToBeRemediated, metav1.Condition{
 		Type:   clusterv1.MachineOwnerRemediatedV1Beta2Condition,
 		Status: metav1.ConditionFalse,
-		Reason: controlplanev1.KubeadmControlPlaneMachineRemediationDoneV1Beta2Reason,
+		Reason: controlplanev1.KubeadmControlPlaneMachineRemediationMachineDeletedV1Beta2Reason,
 	})
 
 	// Prepare the info for tracking the remediation progress into the RemediationInProgressAnnotation.
@@ -524,7 +524,6 @@ func (r *KubeadmControlPlaneReconciler) canSafelyRemoveEtcdMember(ctx context.Co
 		}
 
 		// Check member health as reported by machine's health conditions
-		// TODO: note as phase 2 task
 		if !conditions.IsTrue(machine, controlplanev1.MachineEtcdMemberHealthyCondition) {
 			targetUnhealthyMembers++
 			unhealthyMembers = append(unhealthyMembers, fmt.Sprintf("%s (%s)", etcdMember, machine.Name))