@@ -81,7 +81,7 @@ private PostExecutionControl<P> handleDispatch(ExecutionScope<P> executionScope)
81
81
originalResource .getMetadata ().getNamespace ());
82
82
83
83
final var markedForDeletion = originalResource .isMarkedForDeletion ();
84
- if (!configuration (). isAllEventReconcileMode ()
84
+ if (!isAllEventMode ()
85
85
&& markedForDeletion
86
86
&& shouldNotDispatchToCleanupWhenMarkedForDeletion (originalResource )) {
87
87
log .debug (
@@ -100,7 +100,7 @@ && shouldNotDispatchToCleanupWhenMarkedForDeletion(originalResource)) {
100
100
executionScope .isDeleteFinalStateUnknown ());
101
101
102
102
// checking the cleaner for all-event-mode
103
- if (markedForDeletion && controller .isCleaner ()) {
103
+ if ((! isAllEventMode () && markedForDeletion ) || ( isAllEventMode () && controller .isCleaner () )) {
104
104
return handleCleanup (resourceForExecution , originalResource , context , executionScope );
105
105
} else {
106
106
return handleReconcile (executionScope , resourceForExecution , originalResource , context );
@@ -119,7 +119,7 @@ private PostExecutionControl<P> handleReconcile(
119
119
P originalResource ,
120
120
Context <P > context )
121
121
throws Exception {
122
- if (!configuration (). isAllEventReconcileMode ()
122
+ if (!isAllEventMode ()
123
123
&& controller .useFinalizer ()
124
124
&& !originalResource .hasFinalizer (configuration ().getFinalizerName ())) {
125
125
/*
@@ -289,7 +289,7 @@ private PostExecutionControl<P> handleCleanup(
289
289
}
290
290
DeleteControl deleteControl = controller .cleanup (resourceForExecution , context );
291
291
final var useFinalizer = controller .useFinalizer ();
292
- if (useFinalizer && !configuration (). isAllEventReconcileMode ()) {
292
+ if (useFinalizer && !isAllEventMode ()) {
293
293
// note that we don't reschedule here even if instructed. Removing finalizer means that
294
294
// cleanup is finished, nothing left to be done
295
295
final var finalizerName = configuration ().getFinalizerName ();
@@ -531,4 +531,8 @@ private Resource<R> resource(R resource) {
531
531
: resourceOperation .resource (resource );
532
532
}
533
533
}
534
+
535
+ private boolean isAllEventMode () {
536
+ return configuration ().isAllEventReconcileMode ();
537
+ }
534
538
}
0 commit comments