Merge pull request #7571 from dharmicksai/NeedsRollout

🌱 New Filter NeedsRollout to determine if a machine needs rollout.

Author: k8s-ci-robot

controlplane/kubeadm/internal/control_plane.go

@@ -168,26 +168,16 @@ func (c *ControlPlane) MachinesNeedingRollout() collections.Machines {
 	machines := c.Machines.Filter(collections.Not(collections.HasDeletionTimestamp))
 
 	// Return machines if they are scheduled for rollout or if with an outdated configuration.
-	return machines.AnyFilter(
-		// Machines whose certificates are about to expire.
-		collections.ShouldRolloutBefore(&c.reconciliationTime, c.KCP.Spec.RolloutBefore),
-		// Machines that are scheduled for rollout (KCP.Spec.RolloutAfter set, the RolloutAfter deadline is expired, and the machine was created before the deadline).
-		collections.ShouldRolloutAfter(&c.reconciliationTime, c.KCP.Spec.RolloutAfter),
-		// Machines that do not match with KCP config.
-		collections.Not(MatchesMachineSpec(c.infraResources, c.kubeadmConfigs, c.KCP)),
+	return machines.Filter(
+		NeedsRollout(&c.reconciliationTime, c.KCP.Spec.RolloutAfter, c.KCP.Spec.RolloutBefore, c.infraResources, c.kubeadmConfigs, c.KCP),
 	)
 }
 
 // UpToDateMachines returns the machines that are up to date with the control
 // plane's configuration and therefore do not require rollout.
 func (c *ControlPlane) UpToDateMachines() collections.Machines {
 	return c.Machines.Filter(
-		// Machines that shouldn't be rollout out if their certificates are not about to expire.
-		collections.Not(collections.ShouldRolloutBefore(&c.reconciliationTime, c.KCP.Spec.RolloutBefore)),
-		// Machines that shouldn't be rolled out after the deadline has expired.
-		collections.Not(collections.ShouldRolloutAfter(&c.reconciliationTime, c.KCP.Spec.RolloutAfter)),
-		// Machines that match with KCP config.
-		MatchesMachineSpec(c.infraResources, c.kubeadmConfigs, c.KCP),
+		collections.Not(NeedsRollout(&c.reconciliationTime, c.KCP.Spec.RolloutAfter, c.KCP.Spec.RolloutBefore, c.infraResources, c.kubeadmConfigs, c.KCP)),
 	)
 }
 

controlplane/kubeadm/internal/filters.go

@@ -20,6 +20,7 @@ import (
 	"encoding/json"
 	"reflect"
 
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
@@ -42,6 +43,18 @@ func MatchesMachineSpec(infraConfigs map[string]*unstructured.Unstructured, mach
 	)
 }
 
+// NeedsRollout returns a filter to determine if a machine needs rollout.
+func NeedsRollout(reconciliationTime, rolloutAfter *metav1.Time, rolloutBefore *controlplanev1.RolloutBefore, infraConfigs map[string]*unstructured.Unstructured, machineConfigs map[string]*bootstrapv1.KubeadmConfig, kcp *controlplanev1.KubeadmControlPlane) func(machine *clusterv1.Machine) bool {
+	return collections.Or(
+		// Machines whose certificates are about to expire.
+		collections.ShouldRolloutBefore(reconciliationTime, rolloutBefore),
+		// Machines that are scheduled for rollout (KCP.Spec.RolloutAfter set, the RolloutAfter deadline is expired, and the machine was created before the deadline).
+		collections.ShouldRolloutAfter(reconciliationTime, rolloutAfter),
+		// Machines that do not match with KCP config.
+		collections.Not(MatchesMachineSpec(infraConfigs, machineConfigs, kcp)),
+	)
+}
+
 // MatchesTemplateClonedFrom returns a filter to find all machines that match a given KCP infra template.
 func MatchesTemplateClonedFrom(infraConfigs map[string]*unstructured.Unstructured, kcp *controlplanev1.KubeadmControlPlane) collections.Func {
 	return func(machine *clusterv1.Machine) bool {