handle minReadySeconds and improve coverage

Signed-off-by: sivchari <[email protected]>

Author: sivchari

controlplane/kubeadm/internal/controllers/controller.go

@@ -775,6 +775,7 @@ func (r *KubeadmControlPlaneReconciler) ClusterToKubeadmControlPlane(_ context.C
 // "metadata.annotations" from "manager" so that "capi-kubeadmcontrolplane" can own these fields and can work with SSA.
 // Otherwise, fields would be co-owned by our "old" "manager" and "capi-kubeadmcontrolplane" and then we would not be
 // able to e.g. drop labels and annotations.
+// Note: We intentionally don't set "minReadySeconds" on Machines because we consider enough to have machine availability.
 func (r *KubeadmControlPlaneReconciler) syncMachines(ctx context.Context, controlPlane *internal.ControlPlane) error {
 	patchHelpers := map[string]*patch.Helper{}
 	for machineName := range controlPlane.Machines {

controlplane/kubeadm/internal/controllers/helpers.go

@@ -361,6 +361,7 @@ func (r *KubeadmControlPlaneReconciler) updateMachine(ctx context.Context, machi
 // There are small differences in how we calculate the Machine depending on if it
 // is a create or update. Example: for a new Machine we have to calculate a new name,
 // while for an existing Machine we have to use the name of the existing Machine.
+// Note: We intentionally don't set "minReadySeconds" on Machines because we consider enough to have machine availability.
 func (r *KubeadmControlPlaneReconciler) computeDesiredMachine(kcp *controlplanev1.KubeadmControlPlane, cluster *clusterv1.Cluster, failureDomain *string, existingMachine *clusterv1.Machine) (*clusterv1.Machine, error) {
 	var machineName string
 	var machineUID types.UID

internal/controllers/machinedeployment/machinedeployment_sync_test.go

@@ -566,6 +566,7 @@ func TestComputeDesiredMachineSet(t *testing.T) {
 					Bootstrap: clusterv1.Bootstrap{
 						ConfigRef: &bootstrapRef,
 					},
+					MinReadySeconds:         ptr.To[int32](3),
 					ReadinessGates:          []clusterv1.MachineReadinessGate{{ConditionType: "foo"}},
 					NodeDrainTimeout:        duration10s,
 					NodeVolumeDetachTimeout: duration10s,
@@ -791,6 +792,9 @@ func assertMachineSet(g *WithT, actualMS *clusterv1.MachineSet, expectedMS *clus
 		g.Expect(actualMS.Spec.Template.Annotations).Should(HaveKeyWithValue(k, v))
 	}
 
+	// Check MinReadySeconds
+	g.Expect(actualMS.Spec.Template.Spec.MinReadySeconds).Should(Equal(expectedMS.Spec.Template.Spec.MinReadySeconds))
+
 	// Check DeletePolicy
 	g.Expect(actualMS.Spec.DeletePolicy).Should(Equal(expectedMS.Spec.DeletePolicy))
 

internal/controllers/machinedeployment/mdutil/util_test.go

@@ -184,6 +184,7 @@ func TestMachineTemplateUpToDate(t *testing.T) {
 			ClusterName:             "cluster1",
 			Version:                 ptr.To("v1.25.0"),
 			FailureDomain:           ptr.To("failure-domain1"),
+			MinReadySeconds:         ptr.To[int32](10),
 			InfrastructureRef: corev1.ObjectReference{
 				Name:       "infra1",
 				Namespace:  "default",

internal/controllers/machineset/machineset_controller.go

@@ -517,6 +517,7 @@ func (r *Reconciler) syncMachines(ctx context.Context, s *scope) (ctrl.Result, e
 			m.Spec.NodeDrainTimeout = machineSet.Spec.Template.Spec.NodeDrainTimeout
 			m.Spec.NodeDeletionTimeout = machineSet.Spec.Template.Spec.NodeDeletionTimeout
 			m.Spec.NodeVolumeDetachTimeout = machineSet.Spec.Template.Spec.NodeVolumeDetachTimeout
+			m.Spec.MinReadySeconds = machineSet.Spec.Template.Spec.MinReadySeconds
 
 			// Set machine's up to date condition
 			if upToDateCondition != nil {
@@ -1200,7 +1201,7 @@ func (r *Reconciler) reconcileV1Beta1Status(ctx context.Context, s *scope) error
 
 		if noderefutil.IsNodeReady(node) {
 			readyReplicasCount++
-			if noderefutil.IsNodeAvailable(node, ptr.Deref(machine.Spec.MinReadySeconds, 0), metav1.Now()) {
+			if noderefutil.IsNodeAvailable(node, ptr.Deref(ms.Spec.Template.Spec.MinReadySeconds, 0), metav1.Now()) {
 				availableReplicasCount++
 			}
 		} else if machine.GetDeletionTimestamp().IsZero() {