@@ -40,12 +40,12 @@ import (
4040 "sigs.k8s.io/cluster-api-provider-aws/v2/bootstrap/eks/internal/userdata"
4141 ekscontrolplanev1 "sigs.k8s.io/cluster-api-provider-aws/v2/controlplane/eks/api/v1beta2"
4242 "sigs.k8s.io/cluster-api-provider-aws/v2/pkg/logger"
43+ "sigs.k8s.io/cluster-api-provider-aws/v2/util/paused"
4344 clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
4445 bsutil "sigs.k8s.io/cluster-api/bootstrap/util"
4546 expclusterv1 "sigs.k8s.io/cluster-api/exp/api/v1beta1"
4647 "sigs.k8s.io/cluster-api/feature"
4748 "sigs.k8s.io/cluster-api/util"
48- "sigs.k8s.io/cluster-api/util/annotations"
4949 "sigs.k8s.io/cluster-api/util/conditions"
5050 "sigs.k8s.io/cluster-api/util/patch"
5151 "sigs.k8s.io/cluster-api/util/predicates"
@@ -113,9 +113,8 @@ func (r *EKSConfigReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
113113 }
114114 log = log .WithValues ("cluster" , klog .KObj (cluster ))
115115
116- if annotations .IsPaused (cluster , config ) {
117- log .Info ("Reconciliation is paused for this object" )
118- return ctrl.Result {}, nil
116+ if isPaused , conditionChanged , err := paused .EnsurePausedCondition (ctx , r .Client , cluster , config ); err != nil || isPaused || conditionChanged {
117+ return ctrl.Result {}, err
119118 }
120119
121120 patchHelper , err := patch .NewHelper (config , r .Client )
@@ -294,7 +293,7 @@ func (r *EKSConfigReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Man
294293 b := ctrl .NewControllerManagedBy (mgr ).
295294 For (& eksbootstrapv1.EKSConfig {}).
296295 WithOptions (option ).
297- WithEventFilter (predicates .ResourceNotPausedAndHasFilterLabel (mgr .GetScheme (), logger .FromContext (ctx ).GetLogger (), r .WatchFilterValue )).
296+ WithEventFilter (predicates .ResourceHasFilterLabel (mgr .GetScheme (), logger .FromContext (ctx ).GetLogger (), r .WatchFilterValue )).
298297 Watches (
299298 & clusterv1.Machine {},
300299 handler .EnqueueRequestsFromMapFunc (r .MachineToBootstrapMapFunc ),
0 commit comments