Skip to content

Commit 2e9a201

Browse files
committed
controllers: adapt for CAPI 1.9 breaking changes
Add schemes into predicates (see kubernetes-sigs/cluster-api#11239)
1 parent 5fe1d56 commit 2e9a201

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

controllers/openstackcluster_controller.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -868,15 +868,15 @@ func (r *OpenStackClusterReconciler) SetupWithManager(ctx context.Context, mgr c
868868
}
869869
return requests
870870
}),
871-
builder.WithPredicates(predicates.ClusterUnpaused(ctrl.LoggerFrom(ctx))),
871+
builder.WithPredicates(predicates.ClusterUnpaused(mgr.GetScheme(), ctrl.LoggerFrom(ctx))),
872872
).
873873
Watches(
874874
&infrav1alpha1.OpenStackServer{},
875875
handler.EnqueueRequestForOwner(mgr.GetScheme(), mgr.GetRESTMapper(), &infrav1.OpenStackCluster{}),
876876
builder.WithPredicates(OpenStackServerReconcileComplete(log)),
877877
).
878-
WithEventFilter(predicates.ResourceNotPausedAndHasFilterLabel(ctrl.LoggerFrom(ctx), r.WatchFilterValue)).
879-
WithEventFilter(predicates.ResourceIsNotExternallyManaged(ctrl.LoggerFrom(ctx))).
878+
WithEventFilter(predicates.ResourceNotPausedAndHasFilterLabel(mgr.GetScheme(), ctrl.LoggerFrom(ctx), r.WatchFilterValue)).
879+
WithEventFilter(predicates.ResourceIsNotExternallyManaged(mgr.GetScheme(), ctrl.LoggerFrom(ctx))).
880880
Complete(r)
881881
}
882882

controllers/openstackmachine_controller.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -198,11 +198,11 @@ func (r *OpenStackMachineReconciler) SetupWithManager(ctx context.Context, mgr c
198198
&clusterv1.Machine{},
199199
handler.EnqueueRequestsFromMapFunc(util.MachineToInfrastructureMapFunc(infrav1.SchemeGroupVersion.WithKind("OpenStackMachine"))),
200200
).
201-
WithEventFilter(predicates.ResourceNotPausedAndHasFilterLabel(ctrl.LoggerFrom(ctx), r.WatchFilterValue)).
201+
WithEventFilter(predicates.ResourceNotPausedAndHasFilterLabel(mgr.GetScheme(), ctrl.LoggerFrom(ctx), r.WatchFilterValue)).
202202
Watches(
203203
&clusterv1.Cluster{},
204204
handler.EnqueueRequestsFromMapFunc(r.requeueOpenStackMachinesForUnpausedCluster(ctx)),
205-
builder.WithPredicates(predicates.ClusterUnpausedAndInfrastructureReady(log)),
205+
builder.WithPredicates(predicates.ClusterPausedTransitionsOrInfrastructureReady(mgr.GetScheme(), log)),
206206
).
207207
// NOTE: we don't watch OpenStackCluster here, even though the
208208
// OpenStackMachine controller directly requires values from

0 commit comments

Comments
 (0)