fix

Author: Yuvaraj Kakaraparthi

controlplane/kubeadm/api/v1alpha4/conversion.go

@@ -141,6 +141,8 @@ func (src *KubeadmControlPlaneTemplate) ConvertTo(dstRaw conversion.Hub) error {
 		dst.Spec.Template.Spec.MachineTemplate.NodeDeletionTimeout = restored.Spec.Template.Spec.MachineTemplate.NodeDeletionTimeout
 	}
 
+	dst.Spec.Template.Spec.RolloutIfCertificatesExpireWithinMinutes = restored.Spec.Template.Spec.RolloutIfCertificatesExpireWithinMinutes
+
 	return nil
 }
 

internal/controllers/machinehealthcheck/machinehealthcheck_targets_test.go

@@ -210,8 +210,7 @@ func TestHealthCheckTargets(t *testing.T) {
 
 	timeoutForMachineToHaveNode := 10 * time.Minute
 	disabledTimeoutForMachineToHaveNode := time.Duration(0)
-
-	twoDaysFromNow := time.Now().Add(time.Hour * 24 * 2)
+	timeoutForUnhealthyConditions := 5 * time.Minute
 
 	// Create a test MHC
 	testMHC := &clusterv1.MachineHealthCheck{
@@ -241,9 +240,6 @@ func TestHealthCheckTargets(t *testing.T) {
 
 	testMachine := newTestMachine("machine1", namespace, clusterName, "node1", mhcSelector)
 
-	testMachineWithExpiringCertificate := testMachine.DeepCopy()
-	testMachineWithExpiringCertificate.Status.CertificatesExpiryDate = &metav1.Time{Time: twoDaysFromNow}
-
 	// Targets for when the node has not yet been seen by the Machine controller
 	testMachineCreated1200s := testMachine.DeepCopy()
 	nowMinus1200s := metav1.NewTime(time.Now().Add(-1200 * time.Second))
@@ -344,14 +340,6 @@ func TestHealthCheckTargets(t *testing.T) {
 	}
 	machineFailureMsgCondition := newFailedHealthCheckCondition(clusterv1.MachineHasFailureReason, "FailureMessage: %s", failureMsg)
 
-	machineCertExpiringTarget := healthCheckTarget{
-		Cluster:     cluster,
-		MHC:         testMHC,
-		Machine:     testMachineWithExpiringCertificate,
-		Node:        testNodeHealthy,
-		nodeMissing: false,
-	}
-
 	testCases := []struct {
 		desc                              string
 		targets                           []healthCheckTarget
@@ -438,13 +426,6 @@ func TestHealthCheckTargets(t *testing.T) {
 			expectedNeedsRemediationCondition: []clusterv1.Condition{machineFailureMsgCondition},
 			expectedNextCheckTimes:            []time.Duration{},
 		},
-		{
-			desc:                     "when a machines certificates are not valid for longer than the minimum expiry duration",
-			targets:                  []healthCheckTarget{machineCertExpiringTarget},
-			expectedHealthy:          []healthCheckTarget{},
-			expectedNeedsRemediation: []healthCheckTarget{machineCertExpiringTarget},
-			expectedNextCheckTimes:   []time.Duration{},
-		},
 	}
 
 	for _, tc := range testCases {