Skip to content

Commit

Permalink
Fix predicate name, add logging and add it to external and owns watches
Browse files Browse the repository at this point in the history
  • Loading branch information
@chrischdi
chrischdi committed Dec 19, 2024
1 parent 498d3f2 commit 887ee67
Show file tree
Hide file tree
Showing 24 changed files with 65 additions and 59 deletions.
6 changes: 3 additions & 3 deletions bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,14 +122,14 @@ func (r *KubeadmConfigReconciler) SetupWithManager(ctx context.Context, mgr ctrl
Watches(
&clusterv1.Machine{},
handler.EnqueueRequestsFromMapFunc(r.MachineToBootstrapMapFunc),
builder.WithPredicates(predicates.ResourceIsUnchanged()),
builder.WithPredicates(predicates.ResourceIsChanged(predicateLog)),
).WithEventFilter(predicates.ResourceHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue))

if feature.Gates.Enabled(feature.MachinePool) {
b = b.Watches(
&expv1.MachinePool{},
handler.EnqueueRequestsFromMapFunc(r.MachinePoolToBootstrapMapFunc),
builder.WithPredicates(predicates.ResourceIsUnchanged()),
builder.WithPredicates(predicates.ResourceIsChanged(predicateLog)),
)
}

Expand All @@ -138,7 +138,7 @@ func (r *KubeadmConfigReconciler) SetupWithManager(ctx context.Context, mgr ctrl
handler.EnqueueRequestsFromMapFunc(r.ClusterToKubeadmConfigs),
builder.WithPredicates(
predicates.All(mgr.GetScheme(), predicateLog,
predicates.ResourceIsUnchanged(),
predicates.ResourceIsChanged(predicateLog),
predicates.ClusterPausedTransitionsOrInfrastructureReady(mgr.GetScheme(), predicateLog),
predicates.ResourceHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue),
),
Expand Down
4 changes: 2 additions & 2 deletions controlplane/kubeadm/internal/controllers/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,15 +115,15 @@ func (r *KubeadmControlPlaneReconciler) SetupWithManager(ctx context.Context, mg
predicateLog := ctrl.LoggerFrom(ctx).WithValues("controller", "kubeadmcontrolplane")
c, err := ctrl.NewControllerManagedBy(mgr).
For(&controlplanev1.KubeadmControlPlane{}).
Owns(&clusterv1.Machine{}).
Owns(&clusterv1.Machine{}, builder.WithPredicates(predicates.ResourceIsChanged(predicateLog))).
WithOptions(options).
WithEventFilter(predicates.ResourceHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue)).
Watches(
&clusterv1.Cluster{},
handler.EnqueueRequestsFromMapFunc(r.ClusterToKubeadmControlPlane),
builder.WithPredicates(
predicates.All(mgr.GetScheme(), predicateLog,
predicates.ResourceIsUnchanged(),
predicates.ResourceIsChanged(predicateLog),
predicates.ResourceHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue),
predicates.ClusterPausedTransitionsOrInfrastructureReady(mgr.GetScheme(), predicateLog),
),
Expand Down
6 changes: 3 additions & 3 deletions exp/addons/internal/controllers/clusterresourceset_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ func (r *ClusterResourceSetReconciler) SetupWithManager(ctx context.Context, mgr
Watches(
&clusterv1.Cluster{},
handler.EnqueueRequestsFromMapFunc(r.clusterToClusterResourceSet),
builder.WithPredicates(predicates.ResourceIsUnchanged()),
builder.WithPredicates(predicates.ResourceIsChanged(predicateLog)),
).
WatchesRawSource(r.ClusterCache.GetClusterSource("clusterresourceset", r.clusterToClusterResourceSet)).
WatchesMetadata(
Expand All @@ -91,7 +91,7 @@ func (r *ClusterResourceSetReconciler) SetupWithManager(ctx context.Context, mgr
),
builder.WithPredicates(
predicates.All(mgr.GetScheme(), predicateLog,
predicates.ResourceIsUnchanged(),
predicates.ResourceIsChanged(predicateLog),
resourcepredicates.TypedResourceCreateOrUpdate[client.Object](predicateLog),
),
),
Expand All @@ -108,7 +108,7 @@ func (r *ClusterResourceSetReconciler) SetupWithManager(ctx context.Context, mgr
resourceToClusterResourceSetFunc[*metav1.PartialObjectMetadata](r.Client),
),
predicates.TypedAll(mgr.GetScheme(), predicateLog,
predicates.TypedResourceIsUnchanged[*metav1.PartialObjectMetadata](),
predicates.TypedResourceIsChanged[*metav1.PartialObjectMetadata](predicateLog),
resourcepredicates.TypedResourceCreateOrUpdate[*metav1.PartialObjectMetadata](predicateLog),
),
)).
Expand Down
2 changes: 1 addition & 1 deletion exp/addons/internal/controllers/clusterresourcesetbinding_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func (r *ClusterResourceSetBindingReconciler) SetupWithManager(ctx context.Conte
Watches(
&clusterv1.Cluster{},
handler.EnqueueRequestsFromMapFunc(r.clusterToClusterResourceSetBinding),
builder.WithPredicates(predicates.ResourceIsUnchanged()),
builder.WithPredicates(predicates.ResourceIsChanged(predicateLog)),
).
WithOptions(options).
WithEventFilter(predicates.ResourceNotPausedAndHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue)).
Expand Down
4 changes: 2 additions & 2 deletions exp/internal/controllers/machinepool_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ func (r *MachinePoolReconciler) SetupWithManager(ctx context.Context, mgr ctrl.M
// TODO: should this wait for Cluster.Status.InfrastructureReady similar to Infra Machine resources?
builder.WithPredicates(
predicates.All(mgr.GetScheme(), predicateLog,
predicates.ResourceIsUnchanged(),
predicates.ResourceIsChanged(predicateLog),
predicates.ClusterPausedTransitions(mgr.GetScheme(), predicateLog),
predicates.ResourceHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue),
),
Expand Down Expand Up @@ -379,7 +379,7 @@ func (r *MachinePoolReconciler) watchClusterNodes(ctx context.Context, cluster *
Watcher: r.controller,
Kind: &corev1.Node{},
EventHandler: handler.EnqueueRequestsFromMapFunc(r.nodeToMachinePool),
Predicates: []predicate.TypedPredicate[client.Object]{predicates.TypedResourceIsUnchanged[client.Object]()},
Predicates: []predicate.TypedPredicate[client.Object]{predicates.TypedResourceIsChanged[client.Object](log)},
}))
}

Expand Down
4 changes: 2 additions & 2 deletions exp/internal/controllers/machinepool_controller_phases.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ func (r *MachinePoolReconciler) reconcileExternal(ctx context.Context, m *expv1.
}

// Ensure we add a watch to the external object, if there isn't one already.
if err := r.externalTracker.Watch(log, obj, handler.EnqueueRequestForOwner(r.Client.Scheme(), r.Client.RESTMapper(), &expv1.MachinePool{}), predicates.ResourceIsUnchanged()); err != nil {
if err := r.externalTracker.Watch(log, obj, handler.EnqueueRequestForOwner(r.Client.Scheme(), r.Client.RESTMapper(), &expv1.MachinePool{}), predicates.ResourceIsChanged(log)); err != nil {
return external.ReconcileOutput{}, err
}

Expand Down Expand Up @@ -365,7 +365,7 @@ func (r *MachinePoolReconciler) reconcileMachines(ctx context.Context, s *scope,
sampleInfraMachine.SetKind(infraMachineKind)

// Add watcher for infraMachine, if there isn't one already.
if err := r.externalTracker.Watch(log, sampleInfraMachine, handler.EnqueueRequestsFromMapFunc(r.infraMachineToMachinePoolMapper), predicates.ResourceIsUnchanged()); err != nil {
if err := r.externalTracker.Watch(log, sampleInfraMachine, handler.EnqueueRequestsFromMapFunc(r.infraMachineToMachinePoolMapper), predicates.ResourceIsChanged(log)); err != nil {
return err
}

Expand Down
2 changes: 1 addition & 1 deletion exp/runtime/internal/controllers/extensionconfig_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, opt
handler.TypedEnqueueRequestsFromMapFunc(
r.secretToExtensionConfig,
),
predicates.TypedResourceIsUnchanged[*metav1.PartialObjectMetadata](),
predicates.TypedResourceIsChanged[*metav1.PartialObjectMetadata](predicateLog),
)).
WithOptions(options).
WithEventFilter(predicates.ResourceNotPausedAndHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue)).
Expand Down
6 changes: 3 additions & 3 deletions internal/controllers/cluster/cluster_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,17 +104,17 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, opt
Watches(
&clusterv1.Machine{},
handler.EnqueueRequestsFromMapFunc(r.controlPlaneMachineToCluster),
builder.WithPredicates(predicates.ResourceIsUnchanged()),
builder.WithPredicates(predicates.ResourceIsChanged(predicateLog)),
).
Watches(
&clusterv1.MachineDeployment{},
handler.EnqueueRequestsFromMapFunc(r.machineDeploymentToCluster),
builder.WithPredicates(predicates.ResourceIsUnchanged()),
builder.WithPredicates(predicates.ResourceIsChanged(predicateLog)),
).
Watches(
&expv1.MachinePool{},
handler.EnqueueRequestsFromMapFunc(r.machinePoolToCluster),
builder.WithPredicates(predicates.ResourceIsUnchanged()),
builder.WithPredicates(predicates.ResourceIsChanged(predicateLog)),
).
WithOptions(options).
WithEventFilter(predicates.ResourceHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue)).
Expand Down
2 changes: 1 addition & 1 deletion internal/controllers/cluster/cluster_controller_phases.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ func (r *Reconciler) reconcileExternal(ctx context.Context, cluster *clusterv1.C
}

// Ensure we add a watcher to the external object.
if err := r.externalTracker.Watch(log, obj, handler.EnqueueRequestForOwner(r.Client.Scheme(), r.Client.RESTMapper(), &clusterv1.Cluster{}), predicates.ResourceIsUnchanged()); err != nil {
if err := r.externalTracker.Watch(log, obj, handler.EnqueueRequestForOwner(r.Client.Scheme(), r.Client.RESTMapper(), &clusterv1.Cluster{}), predicates.ResourceIsChanged(log)); err != nil {
return nil, err
}

Expand Down
2 changes: 1 addition & 1 deletion internal/controllers/clusterclass/clusterclass_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, opt
Watches(
&runtimev1.ExtensionConfig{},
handler.EnqueueRequestsFromMapFunc(r.extensionConfigToClusterClass),
builder.WithPredicates(predicates.ResourceIsUnchanged()),
builder.WithPredicates(predicates.ResourceIsChanged(predicateLog)),
).
WithEventFilter(predicates.ResourceHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue)).
Complete(r)
Expand Down
8 changes: 4 additions & 4 deletions internal/controllers/machine/machine_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, opt
builder.WithPredicates(
// TODO: should this wait for Cluster.Status.InfrastructureReady similar to Infra Machine resources?
predicates.All(mgr.GetScheme(), predicateLog,
predicates.ResourceIsUnchanged(),
predicates.ResourceIsChanged(predicateLog),
predicates.ClusterControlPlaneInitialized(mgr.GetScheme(), predicateLog),
predicates.ResourceHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue),
),
Expand All @@ -160,12 +160,12 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, opt
Watches(
&clusterv1.MachineSet{},
handler.EnqueueRequestsFromMapFunc(msToMachines),
builder.WithPredicates(predicates.ResourceIsUnchanged()),
builder.WithPredicates(predicates.ResourceIsChanged(predicateLog)),
).
Watches(
&clusterv1.MachineDeployment{},
handler.EnqueueRequestsFromMapFunc(mdToMachines),
builder.WithPredicates(predicates.ResourceIsUnchanged()),
builder.WithPredicates(predicates.ResourceIsChanged(predicateLog)),
).
Build(r)
if err != nil {
Expand Down Expand Up @@ -1085,7 +1085,7 @@ func (r *Reconciler) watchClusterNodes(ctx context.Context, cluster *clusterv1.C
Watcher: r.controller,
Kind: &corev1.Node{},
EventHandler: handler.EnqueueRequestsFromMapFunc(r.nodeToMachine),
Predicates: []predicate.TypedPredicate[client.Object]{predicates.TypedResourceIsUnchanged[client.Object]()},
Predicates: []predicate.TypedPredicate[client.Object]{predicates.TypedResourceIsChanged[client.Object](log)},
}))
}

Expand Down
2 changes: 1 addition & 1 deletion internal/controllers/machine/machine_controller_phases.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func (r *Reconciler) ensureExternalOwnershipAndWatch(ctx context.Context, cluste
}

// Ensure we add a watch to the external object, if there isn't one already.
if err := r.externalTracker.Watch(log, obj, handler.EnqueueRequestForOwner(r.Client.Scheme(), r.Client.RESTMapper(), &clusterv1.Machine{}), predicates.ResourceIsUnchanged()); err != nil {
if err := r.externalTracker.Watch(log, obj, handler.EnqueueRequestForOwner(r.Client.Scheme(), r.Client.RESTMapper(), &clusterv1.Machine{}), predicates.ResourceIsChanged(log)); err != nil {
return nil, err
}

Expand Down
6 changes: 3 additions & 3 deletions internal/controllers/machinedeployment/machinedeployment_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,20 +91,20 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, opt

err = ctrl.NewControllerManagedBy(mgr).
For(&clusterv1.MachineDeployment{}).
Owns(&clusterv1.MachineSet{}).
Owns(&clusterv1.MachineSet{}, builder.WithPredicates(predicates.ResourceIsChanged(predicateLog))).
// Watches enqueues MachineDeployment for corresponding MachineSet resources, if no managed controller reference (owner) exists.
Watches(
&clusterv1.MachineSet{},
handler.EnqueueRequestsFromMapFunc(r.MachineSetToDeployments),
builder.WithPredicates(predicates.ResourceIsUnchanged()),
builder.WithPredicates(predicates.ResourceIsChanged(predicateLog)),
).
WithOptions(options).
WithEventFilter(predicates.ResourceHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue)).
Watches(
&clusterv1.Cluster{},
handler.EnqueueRequestsFromMapFunc(clusterToMachineDeployments),
builder.WithPredicates(predicates.All(mgr.GetScheme(), predicateLog,
predicates.ResourceIsUnchanged(),
predicates.ResourceIsChanged(predicateLog),
predicates.ClusterPausedTransitions(mgr.GetScheme(), predicateLog),
)),
// TODO: should this wait for Cluster.Status.InfrastructureReady similar to Infra Machine resources?
Expand Down
6 changes: 3 additions & 3 deletions internal/controllers/machinehealthcheck/machinehealthcheck_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, opt
Watches(
&clusterv1.Machine{},
handler.EnqueueRequestsFromMapFunc(r.machineToMachineHealthCheck),
builder.WithPredicates(predicates.ResourceIsUnchanged()),
builder.WithPredicates(predicates.ResourceIsChanged(predicateLog)),
).
WithOptions(options).
WithEventFilter(predicates.ResourceHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue)).
Expand All @@ -108,7 +108,7 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, opt
builder.WithPredicates(
// TODO: should this wait for Cluster.Status.InfrastructureReady similar to Infra Machine resources?
predicates.All(mgr.GetScheme(), predicateLog,
predicates.ResourceIsUnchanged(),
predicates.ResourceIsChanged(predicateLog),
predicates.ClusterPausedTransitions(mgr.GetScheme(), predicateLog),
predicates.ResourceHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue),
),
Expand Down Expand Up @@ -620,7 +620,7 @@ func (r *Reconciler) watchClusterNodes(ctx context.Context, cluster *clusterv1.C
Watcher: r.controller,
Kind: &corev1.Node{},
EventHandler: handler.EnqueueRequestsFromMapFunc(r.nodeToMachineHealthCheck),
Predicates: []predicate.TypedPredicate[client.Object]{predicates.TypedResourceIsUnchanged[client.Object]()},
Predicates: []predicate.TypedPredicate[client.Object]{predicates.TypedResourceIsChanged[client.Object](ctrl.LoggerFrom(ctx))},
}))
}

Expand Down
8 changes: 4 additions & 4 deletions internal/controllers/machineset/machineset_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,17 +121,17 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, opt

err = ctrl.NewControllerManagedBy(mgr).
For(&clusterv1.MachineSet{}).
Owns(&clusterv1.Machine{}).
Owns(&clusterv1.Machine{}, builder.WithPredicates(predicates.ResourceIsChanged(predicateLog))).
// Watches enqueues MachineSet for corresponding Machine resources, if no managed controller reference (owner) exists.
Watches(
&clusterv1.Machine{},
handler.EnqueueRequestsFromMapFunc(r.MachineToMachineSets),
builder.WithPredicates(predicates.ResourceIsUnchanged()),
builder.WithPredicates(predicates.ResourceIsChanged(predicateLog)),
).
Watches(
&clusterv1.MachineDeployment{},
handler.EnqueueRequestsFromMapFunc(mdToMachineSets),
builder.WithPredicates(predicates.ResourceIsUnchanged()),
builder.WithPredicates(predicates.ResourceIsChanged(predicateLog)),
).
WithOptions(options).
WithEventFilter(predicates.ResourceHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue)).
Expand All @@ -141,7 +141,7 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, opt
builder.WithPredicates(
// TODO: should this wait for Cluster.Status.InfrastructureReady similar to Infra Machine resources?
predicates.All(mgr.GetScheme(), predicateLog,
predicates.ResourceIsUnchanged(),
predicates.ResourceIsChanged(predicateLog),
predicates.ClusterPausedTransitions(mgr.GetScheme(), predicateLog),
predicates.ResourceHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue),
),
Expand Down
10 changes: 5 additions & 5 deletions internal/controllers/topology/cluster/cluster_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,14 +115,14 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, opt
Watches(
&clusterv1.ClusterClass{},
handler.EnqueueRequestsFromMapFunc(r.clusterClassToCluster),
builder.WithPredicates(predicates.ResourceIsUnchanged()),
builder.WithPredicates(predicates.ResourceIsChanged(r.predicateLog)),
).
Watches(
&clusterv1.MachineDeployment{},
handler.EnqueueRequestsFromMapFunc(r.machineDeploymentToCluster),
// Only trigger Cluster reconciliation if the MachineDeployment is topology owned.
builder.WithPredicates(predicates.All(mgr.GetScheme(), r.predicateLog,
predicates.ResourceIsUnchanged(),
predicates.ResourceIsChanged(r.predicateLog),
predicates.ResourceIsTopologyOwned(mgr.GetScheme(), r.predicateLog),
)),
).
Expand All @@ -131,7 +131,7 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, opt
handler.EnqueueRequestsFromMapFunc(r.machinePoolToCluster),
// Only trigger Cluster reconciliation if the MachinePool is topology owned.
builder.WithPredicates(predicates.All(mgr.GetScheme(), r.predicateLog,
predicates.ResourceIsUnchanged(),
predicates.ResourceIsChanged(r.predicateLog),
predicates.ResourceIsTopologyOwned(mgr.GetScheme(), r.predicateLog),
)),
).
Expand Down Expand Up @@ -332,7 +332,7 @@ func (r *Reconciler) setupDynamicWatches(ctx context.Context, s *scope.Scope) er
handler.EnqueueRequestForOwner(scheme, r.Client.RESTMapper(), &clusterv1.Cluster{}),
// Only trigger Cluster reconciliation if the InfrastructureCluster is topology owned.
predicates.All(scheme, r.predicateLog,
predicates.ResourceIsUnchanged(),
predicates.ResourceIsChanged(r.predicateLog),
predicates.ResourceIsTopologyOwned(scheme, r.predicateLog),
)); err != nil {
return errors.Wrap(err, "error watching Infrastructure CR")
Expand All @@ -343,7 +343,7 @@ func (r *Reconciler) setupDynamicWatches(ctx context.Context, s *scope.Scope) er
handler.EnqueueRequestForOwner(scheme, r.Client.RESTMapper(), &clusterv1.Cluster{}),
// Only trigger Cluster reconciliation if the ControlPlane is topology owned.
predicates.All(scheme, r.predicateLog,
predicates.ResourceIsUnchanged(),
predicates.ResourceIsChanged(r.predicateLog),
predicates.ResourceIsTopologyOwned(scheme, r.predicateLog),
)); err != nil {
return errors.Wrap(err, "error watching ControlPlane CR")
Expand Down
2 changes: 1 addition & 1 deletion internal/controllers/topology/machinedeployment/machinedeployment_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, opt
handler.EnqueueRequestsFromMapFunc(clusterToMachineDeployments),
builder.WithPredicates(
predicates.All(mgr.GetScheme(), predicateLog,
predicates.ResourceIsUnchanged(),
predicates.ResourceIsChanged(predicateLog),
predicates.ClusterUnpaused(mgr.GetScheme(), predicateLog),
predicates.ClusterHasTopology(mgr.GetScheme(), predicateLog),
),
Expand Down
2 changes: 1 addition & 1 deletion internal/controllers/topology/machineset/machineset_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, opt
handler.EnqueueRequestsFromMapFunc(clusterToMachineSets),
builder.WithPredicates(
predicates.All(mgr.GetScheme(), predicateLog,
predicates.ResourceIsUnchanged(),
predicates.ResourceIsChanged(predicateLog),
predicates.ClusterUnpaused(mgr.GetScheme(), predicateLog),
predicates.ClusterHasTopology(mgr.GetScheme(), predicateLog),
),
Expand Down
6 changes: 3 additions & 3 deletions test/infrastructure/docker/exp/internal/controllers/dockermachinepool_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,18 +173,18 @@ func (r *DockerMachinePoolReconciler) SetupWithManager(ctx context.Context, mgr
&expv1.MachinePool{},
handler.EnqueueRequestsFromMapFunc(utilexp.MachinePoolToInfrastructureMapFunc(ctx,
infraexpv1.GroupVersion.WithKind("DockerMachinePool"))),
builder.WithPredicates(predicates.ResourceIsUnchanged()),
builder.WithPredicates(predicates.ResourceIsChanged(predicateLog)),
).
Watches(
&infrav1.DockerMachine{},
handler.EnqueueRequestsFromMapFunc(dockerMachineToDockerMachinePool),
builder.WithPredicates(predicates.ResourceIsUnchanged()),
builder.WithPredicates(predicates.ResourceIsChanged(predicateLog)),
).
Watches(
&clusterv1.Cluster{},
handler.EnqueueRequestsFromMapFunc(clusterToDockerMachinePools),
builder.WithPredicates(predicates.All(mgr.GetScheme(), predicateLog,
predicates.ResourceIsUnchanged(),
predicates.ResourceIsChanged(predicateLog),
//nolint:staticcheck // This usage will be removed when adding v1beta2 status and implementing the Paused condition.
predicates.ClusterUnpausedAndInfrastructureReady(mgr.GetScheme(), predicateLog),
)),
Expand Down
Loading

0 comments on commit 887ee67

Please sign in to comment.