@@ -40,15 +40,15 @@ public class EventSourceManager<R extends HasMetadata> implements LifecycleAware
   EventSourceManager(EventProcessor<R> eventProcessor) {
     this.eventProcessor = eventProcessor;
     controller = null;
-    registerEventSource(eventSources.initRetryEventSource());
+    registerEventSource(eventSources.retryEventSource());
   }
 
   public EventSourceManager(Controller<R> controller) {
     this.controller = controller;
     // controller event source needs to be available before we create the event processor
     final var controllerEventSource = eventSources.initControllerEventSource(controller);
     this.eventProcessor = new EventProcessor<>(this);
-    registerEventSource(eventSources.initRetryEventSource());
+    registerEventSource(eventSources.retryEventSource());
     registerEventSource(controllerEventSource);
   }
 
@@ -184,7 +184,7 @@ ControllerResourceEventSource<R> initControllerEventSource(Controller<R> control
       return controllerResourceEventSource;
     }
 
-    TimerEventSource<R> initRetryEventSource() {
+    TimerEventSource<R> retryEventSource() {
       return retryAndRescheduleTimerEventSource;
     }
 
 
@@ -25,8 +25,6 @@ public final class ResourceEventFilters {
   private static final ResourceEventFilter<HasMetadata> GENERATION_AWARE =
       (configuration, oldResource, newResource) -> {
         final var generationAware = configuration.isGenerationAware();
-        // todo: change this to check for HasStatus (or similar) when
-        // https://github.com/fabric8io/kubernetes-client/issues/3586 is fixed
         if (newResource instanceof CustomResource<?, ?>) {
           var newCustomResource = (CustomResource<?, ?>) newResource;
           final var status = newCustomResource.getStatus();
 
@@ -97,6 +97,10 @@ public void onResourceDeleted(R resource) {
     cache.remove(resourceID);
   }
 
+  // This method is always called from the same Thread for the same resource,
+  // since events from ResourceEventAware are propagated from the thread of the informer. This is
+  // important
+  // because otherwise there will be a race condition related to the timerTasks.
   private void checkAndRegisterTask(R resource) {
     var resourceID = ResourceID.fromResource(resource);
     if (timerTasks.get(resourceID) == null && (registerPredicate == null
 
@@ -27,8 +27,10 @@ public static void main(String[] args) throws IOException {
     KubernetesClient client = new DefaultKubernetesClient(config);
     Operator operator = new Operator(client, DefaultConfigurationService.instance());
     operator.register(new MySQLSchemaReconciler(client, MySQLDbConfig.loadFromEnvironmentVars()));
+    operator.installShutdownHook();
     operator.start();
 
+
     new FtBasic(new TkFork(new FkRegex("/health", "ALL GOOD!")), 8080).start(Exit.NEVER);
   }
 }
@@ -27,6 +27,7 @@ public static void main(String[] args) throws IOException {
     Operator operator = new Operator(client, DefaultConfigurationService.instance());
     operator.register(new TomcatReconciler(client));
     operator.register(new WebappReconciler(client));
+    operator.installShutdownHook();
     operator.start();
 
     new FtBasic(new TkFork(new FkRegex("/health", "ALL GOOD.")), 8080).start(Exit.NEVER);
 
@@ -27,6 +27,7 @@ public static void main(String[] args) throws IOException {
     KubernetesClient client = new DefaultKubernetesClient(config);
     Operator operator = new Operator(client, DefaultConfigurationService.instance());
     operator.register(new WebPageReconciler(client));
+    operator.installShutdownHook();
     operator.start();
 
     new FtBasic(new TkFork(new FkRegex("/health", "ALL GOOD!")), 8080).start(Exit.NEVER);
Original file line number	Diff line number	Diff line change
`@@ -40,15 +40,15 @@ public class EventSourceManager<R extends HasMetadata> implements LifecycleAware`
`40`	`40`	`EventSourceManager(EventProcessor<R> eventProcessor) {`
`41`	`41`	`this.eventProcessor = eventProcessor;`
`42`	`42`	`controller = null;`
`43`		`- registerEventSource(eventSources.initRetryEventSource());`
	`43`	`+ registerEventSource(eventSources.retryEventSource());`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`public EventSourceManager(Controller<R> controller) {`
`47`	`47`	`this.controller = controller;`
`48`	`48`	`// controller event source needs to be available before we create the event processor`
`49`	`49`	`final var controllerEventSource = eventSources.initControllerEventSource(controller);`
`50`	`50`	`this.eventProcessor = new EventProcessor<>(this);`
`51`		`- registerEventSource(eventSources.initRetryEventSource());`
	`51`	`+ registerEventSource(eventSources.retryEventSource());`
`52`	`52`	`registerEventSource(controllerEventSource);`
`53`	`53`	`}`
`54`	`54`
`@@ -184,7 +184,7 @@ ControllerResourceEventSource<R> initControllerEventSource(Controller<R> control`
`184`	`184`	`return controllerResourceEventSource;`
`185`	`185`	`}`
`186`	`186`
`187`		`- TimerEventSource<R> initRetryEventSource() {`
	`187`	`+ TimerEventSource<R> retryEventSource() {`
`188`	`188`	`return retryAndRescheduleTimerEventSource;`
`189`	`189`	`}`
`190`	`190`
Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,10 @@ public static void main(String[] args) throws IOException {`
`27`	`27`	`KubernetesClient client = new DefaultKubernetesClient(config);`
`28`	`28`	`Operator operator = new Operator(client, DefaultConfigurationService.instance());`
`29`	`29`	`operator.register(new MySQLSchemaReconciler(client, MySQLDbConfig.loadFromEnvironmentVars()));`
	`30`	`+ operator.installShutdownHook();`
`30`	`31`	`operator.start();`
`31`	`32`
	`33`	`+`
`32`	`34`	`new FtBasic(new TkFork(new FkRegex("/health", "ALL GOOD!")), 8080).start(Exit.NEVER);`
`33`	`35`	`}`
`34`	`36`	`}`