Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

⚠️ Fix object logging in predicates #11239

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

⚠️ Fix object logging in predicates #11239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ func (r *KubeadmConfigReconciler) SetupWithManager(ctx context.Context, mgr ctrl
handler.EnqueueRequestsFromMapFunc(r.ClusterToKubeadmConfigs),
builder.WithPredicates(
predicates.All(predicateLog,
predicates.ClusterUnpausedAndInfrastructureReady(predicateLog),
predicates.ClusterUnpausedAndInfrastructureReady(mgr.GetScheme(), predicateLog),
predicates.ResourceHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue),
),
),
Expand Down
2 changes: 1 addition & 1 deletion controlplane/kubeadm/internal/controllers/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ func (r *KubeadmControlPlaneReconciler) SetupWithManager(ctx context.Context, mg
builder.WithPredicates(
predicates.All(predicateLog,
predicates.ResourceHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue),
predicates.ClusterUnpausedAndInfrastructureReady(predicateLog),
predicates.ClusterUnpausedAndInfrastructureReady(mgr.GetScheme(), predicateLog),
),
),
).Build(r)
Expand Down
2 changes: 1 addition & 1 deletion exp/internal/controllers/machinepool_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,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(predicateLog,
predicates.ClusterUnpaused(predicateLog),
predicates.ClusterUnpaused(mgr.GetScheme(), predicateLog),
predicates.ResourceHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue),
),
),
Expand Down
4 changes: 2 additions & 2 deletions internal/controllers/machine/machine_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, opt
// TODO: should this wait for Cluster.Status.InfrastructureReady similar to Infra Machine resources?
predicates.All(predicateLog,
predicates.Any(predicateLog,
predicates.ClusterUnpaused(predicateLog),
predicates.ClusterControlPlaneInitialized(predicateLog),
predicates.ClusterUnpaused(mgr.GetScheme(), predicateLog),
predicates.ClusterControlPlaneInitialized(mgr.GetScheme(), predicateLog),
),
predicates.ResourceHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue),
),
Expand Down
2 changes: 1 addition & 1 deletion internal/controllers/machinedeployment/machinedeployment_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,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(predicateLog,
predicates.ClusterUnpaused(predicateLog),
predicates.ClusterUnpaused(mgr.GetScheme(), predicateLog),
),
),
).Complete(r)
Expand Down
2 changes: 1 addition & 1 deletion internal/controllers/machinehealthcheck/machinehealthcheck_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,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(predicateLog,
predicates.ClusterUnpaused(predicateLog),
predicates.ClusterUnpaused(mgr.GetScheme(), predicateLog),
predicates.ResourceHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue),
),
),
Expand Down
2 changes: 1 addition & 1 deletion internal/controllers/machineset/machineset_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,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(predicateLog,
predicates.ClusterUnpaused(predicateLog),
predicates.ClusterUnpaused(mgr.GetScheme(), predicateLog),
predicates.ResourceHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue),
),
),
Expand Down
15 changes: 8 additions & 7 deletions internal/controllers/topology/cluster/cluster_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, opt
c, err := ctrl.NewControllerManagedBy(mgr).
For(&clusterv1.Cluster{}, builder.WithPredicates(
// Only reconcile Cluster with topology.
predicates.ClusterHasTopology(predicateLog),
predicates.ClusterHasTopology(mgr.GetScheme(), predicateLog),
)).
Named("topology/cluster").
Watches(
Expand All @@ -102,13 +102,13 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, opt
&clusterv1.MachineDeployment{},
handler.EnqueueRequestsFromMapFunc(r.machineDeploymentToCluster),
// Only trigger Cluster reconciliation if the MachineDeployment is topology owned.
builder.WithPredicates(predicates.ResourceIsTopologyOwned(predicateLog)),
builder.WithPredicates(predicates.ResourceIsTopologyOwned(mgr.GetScheme(), predicateLog)),
).
Watches(
&expv1.MachinePool{},
handler.EnqueueRequestsFromMapFunc(r.machinePoolToCluster),
// Only trigger Cluster reconciliation if the MachinePool is topology owned.
builder.WithPredicates(predicates.ResourceIsTopologyOwned(predicateLog)),
builder.WithPredicates(predicates.ResourceIsTopologyOwned(mgr.GetScheme(), predicateLog)),
).
WithOptions(options).
WithEventFilter(predicates.ResourceNotPausedAndHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue)).
Expand Down Expand Up @@ -295,19 +295,20 @@ func (r *Reconciler) reconcile(ctx context.Context, s *scope.Scope) (ctrl.Result

// setupDynamicWatches create watches for InfrastructureCluster and ControlPlane CRs when they exist.
func (r *Reconciler) setupDynamicWatches(ctx context.Context, s *scope.Scope) error {
scheme := r.Client.Scheme()
if s.Current.InfrastructureCluster != nil {
if err := r.externalTracker.Watch(ctrl.LoggerFrom(ctx), s.Current.InfrastructureCluster,
handler.EnqueueRequestForOwner(r.Client.Scheme(), r.Client.RESTMapper(), &clusterv1.Cluster{}),
handler.EnqueueRequestForOwner(scheme, r.Client.RESTMapper(), &clusterv1.Cluster{}),
// Only trigger Cluster reconciliation if the InfrastructureCluster is topology owned.
predicates.ResourceIsTopologyOwned(ctrl.LoggerFrom(ctx))); err != nil {
predicates.ResourceIsTopologyOwned(scheme, ctrl.LoggerFrom(ctx))); err != nil {
return errors.Wrap(err, "error watching Infrastructure CR")
}
}
if s.Current.ControlPlane.Object != nil {
if err := r.externalTracker.Watch(ctrl.LoggerFrom(ctx), s.Current.ControlPlane.Object,
handler.EnqueueRequestForOwner(r.Client.Scheme(), r.Client.RESTMapper(), &clusterv1.Cluster{}),
handler.EnqueueRequestForOwner(scheme, r.Client.RESTMapper(), &clusterv1.Cluster{}),
// Only trigger Cluster reconciliation if the ControlPlane is topology owned.
predicates.ResourceIsTopologyOwned(ctrl.LoggerFrom(ctx))); err != nil {
predicates.ResourceIsTopologyOwned(scheme, ctrl.LoggerFrom(ctx))); err != nil {
return errors.Wrap(err, "error watching ControlPlane CR")
}
}
Expand Down
6 changes: 3 additions & 3 deletions internal/controllers/topology/machinedeployment/machinedeployment_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, opt
For(&clusterv1.MachineDeployment{},
builder.WithPredicates(
predicates.All(predicateLog,
predicates.ResourceIsTopologyOwned(predicateLog),
predicates.ResourceIsTopologyOwned(mgr.GetScheme(), predicateLog),
predicates.ResourceNotPaused(mgr.GetScheme(), predicateLog)),
),
).
Expand All @@ -80,8 +80,8 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, opt
handler.EnqueueRequestsFromMapFunc(clusterToMachineDeployments),
builder.WithPredicates(
predicates.All(predicateLog,
predicates.ClusterUnpaused(predicateLog),
predicates.ClusterHasTopology(predicateLog),
predicates.ClusterUnpaused(mgr.GetScheme(), predicateLog),
predicates.ClusterHasTopology(mgr.GetScheme(), predicateLog),
),
),
).
Expand Down
6 changes: 3 additions & 3 deletions internal/controllers/topology/machineset/machineset_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, opt
For(&clusterv1.MachineSet{},
builder.WithPredicates(
predicates.All(predicateLog,
predicates.ResourceIsTopologyOwned(predicateLog),
predicates.ResourceIsTopologyOwned(mgr.GetScheme(), predicateLog),
predicates.ResourceNotPaused(mgr.GetScheme(), predicateLog)),
),
).
Expand All @@ -82,8 +82,8 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, opt
handler.EnqueueRequestsFromMapFunc(clusterToMachineSets),
builder.WithPredicates(
predicates.All(predicateLog,
predicates.ClusterUnpaused(predicateLog),
predicates.ClusterHasTopology(predicateLog),
predicates.ClusterUnpaused(mgr.GetScheme(), predicateLog),
predicates.ClusterHasTopology(mgr.GetScheme(), predicateLog),
),
),
).
Expand Down
2 changes: 1 addition & 1 deletion test/infrastructure/docker/exp/internal/controllers/dockermachinepool_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ func (r *DockerMachinePoolReconciler) SetupWithManager(ctx context.Context, mgr
&clusterv1.Cluster{},
handler.EnqueueRequestsFromMapFunc(clusterToDockerMachinePools),
builder.WithPredicates(
predicates.ClusterUnpausedAndInfrastructureReady(predicateLog),
predicates.ClusterUnpausedAndInfrastructureReady(mgr.GetScheme(), predicateLog),
),
).Build(r)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion test/infrastructure/docker/internal/controllers/dockercluster_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ func (r *DockerClusterReconciler) SetupWithManager(ctx context.Context, mgr ctrl
&clusterv1.Cluster{},
handler.EnqueueRequestsFromMapFunc(util.ClusterToInfrastructureMapFunc(ctx, infrav1.GroupVersion.WithKind("DockerCluster"), mgr.GetClient(), &infrav1.DockerCluster{})),
builder.WithPredicates(
predicates.ClusterUnpaused(predicateLog),
predicates.ClusterUnpaused(mgr.GetScheme(), predicateLog),
),
).Complete(r)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion test/infrastructure/docker/internal/controllers/dockermachine_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ func (r *DockerMachineReconciler) SetupWithManager(ctx context.Context, mgr ctrl
&clusterv1.Cluster{},
handler.EnqueueRequestsFromMapFunc(clusterToDockerMachines),
builder.WithPredicates(
predicates.ClusterUnpausedAndInfrastructureReady(predicateLog),
predicates.ClusterUnpausedAndInfrastructureReady(mgr.GetScheme(), predicateLog),
),
).Complete(r)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion test/infrastructure/inmemory/internal/controllers/inmemorycluster_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ func (r *InMemoryClusterReconciler) SetupWithManager(ctx context.Context, mgr ct
&clusterv1.Cluster{},
handler.EnqueueRequestsFromMapFunc(util.ClusterToInfrastructureMapFunc(ctx, infrav1.GroupVersion.WithKind("InMemoryCluster"), mgr.GetClient(), &infrav1.InMemoryCluster{})),
builder.WithPredicates(
predicates.ClusterUnpaused(predicateLog),
predicates.ClusterUnpaused(mgr.GetScheme(), predicateLog),
),
).Complete(r)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion test/infrastructure/inmemory/internal/controllers/inmemorymachine_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1160,7 +1160,7 @@ func (r *InMemoryMachineReconciler) SetupWithManager(ctx context.Context, mgr ct
&clusterv1.Cluster{},
handler.EnqueueRequestsFromMapFunc(clusterToInMemoryMachines),
builder.WithPredicates(
predicates.ClusterUnpausedAndInfrastructureReady(predicateLog),
predicates.ClusterUnpausedAndInfrastructureReady(mgr.GetScheme(), predicateLog),
),
).Complete(r)
if err != nil {
Expand Down
Loading
Loading