@@ -50,6 +50,7 @@ import (
50
50
"sigs.k8s.io/cluster-api/util/labels"
51
51
clog "sigs.k8s.io/cluster-api/util/log"
52
52
"sigs.k8s.io/cluster-api/util/patch"
53
+ "sigs.k8s.io/cluster-api/util/paused"
53
54
"sigs.k8s.io/cluster-api/util/predicates"
54
55
)
55
56
@@ -119,6 +120,10 @@ func (r *DockerMachineReconciler) Reconcile(ctx context.Context, req ctrl.Reques
119
120
return ctrl.Result {}, nil
120
121
}
121
122
123
+ if isPaused , conditionChanged , err := paused .EnsurePausedCondition (ctx , r .Client , cluster , dockerMachine ); err != nil || isPaused || conditionChanged {
124
+ return ctrl.Result {}, err
125
+ }
126
+
122
127
log = log .WithValues ("Cluster" , klog .KObj (cluster ))
123
128
ctx = ctrl .LoggerInto (ctx , log )
124
129
@@ -487,7 +492,7 @@ func (r *DockerMachineReconciler) SetupWithManager(ctx context.Context, mgr ctrl
487
492
err = ctrl .NewControllerManagedBy (mgr ).
488
493
For (& infrav1.DockerMachine {}).
489
494
WithOptions (options ).
490
- WithEventFilter (predicates .ResourceNotPausedAndHasFilterLabel (mgr .GetScheme (), predicateLog , r .WatchFilterValue )).
495
+ WithEventFilter (predicates .ResourceHasFilterLabel (mgr .GetScheme (), predicateLog , r .WatchFilterValue )).
491
496
Watches (
492
497
& clusterv1.Machine {},
493
498
handler .EnqueueRequestsFromMapFunc (util .MachineToInfrastructureMapFunc (infrav1 .GroupVersion .WithKind ("DockerMachine" ))),
@@ -500,7 +505,7 @@ func (r *DockerMachineReconciler) SetupWithManager(ctx context.Context, mgr ctrl
500
505
& clusterv1.Cluster {},
501
506
handler .EnqueueRequestsFromMapFunc (clusterToDockerMachines ),
502
507
builder .WithPredicates (
503
- predicates .ClusterUnpausedAndInfrastructureReady (mgr .GetScheme (), predicateLog ),
508
+ predicates .ClusterInfrastructureReady (mgr .GetScheme (), predicateLog ),
504
509
),
505
510
).Complete (r )
506
511
if err != nil {
0 commit comments