refactor: move check for missing CRD to CustomResourceEventSource

This indeed makes more sense like this as this should only happen when
attempting to register watches for the primary resources.

Author: metacosm

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/DefaultEventSourceManager.java

@@ -15,7 +15,6 @@
 import org.slf4j.LoggerFactory;
 
 import io.fabric8.kubernetes.client.CustomResource;
-import io.fabric8.kubernetes.client.KubernetesClientException;
 import io.javaoperatorsdk.operator.MissingCRDException;
 import io.javaoperatorsdk.operator.OperatorException;
 import io.javaoperatorsdk.operator.processing.ConfiguredController;
@@ -35,21 +34,18 @@ public class DefaultEventSourceManager<R extends CustomResource<?, ?>>
   private final Map<String, EventSource> eventSources = new ConcurrentHashMap<>();
   private final DefaultEventHandler<R> defaultEventHandler;
   private TimerEventSource<R> retryTimerEventSource;
-  private final String targetCRDName;
 
-  DefaultEventSourceManager(DefaultEventHandler<R> defaultEventHandler, boolean supportRetry,
-      String targetCRDName) {
+  DefaultEventSourceManager(DefaultEventHandler<R> defaultEventHandler, boolean supportRetry) {
     this.defaultEventHandler = defaultEventHandler;
     defaultEventHandler.setEventSourceManager(this);
     if (supportRetry) {
       this.retryTimerEventSource = new TimerEventSource<>();
       registerEventSource(RETRY_TIMER_EVENT_SOURCE_NAME, retryTimerEventSource);
     }
-    this.targetCRDName = targetCRDName;
   }
 
   public DefaultEventSourceManager(ConfiguredController<R> controller) {
-    this(new DefaultEventHandler<>(controller), true, controller.getConfiguration().getCRDName());
+    this(new DefaultEventHandler<>(controller), true);
     registerEventSource(CUSTOM_RESOURCE_EVENT_SOURCE_NAME,
         new CustomResourceEventSource<>(controller));
   }
@@ -88,19 +84,10 @@ public final void registerEventSource(String name, EventSource eventSource)
       eventSource.setEventHandler(defaultEventHandler);
       eventSource.start();
     } catch (Throwable e) {
-      if (e instanceof IllegalStateException) {
+      if (e instanceof IllegalStateException || e instanceof MissingCRDException) {
         // leave untouched
         throw e;
       }
-      if (e instanceof KubernetesClientException) {
-        KubernetesClientException ke = (KubernetesClientException) e;
-        if (404 == ke.getCode()) {
-          // only throw MissingCRDException if the 404 error occurs on the target CRD
-          if (targetCRDName.equals(ke.getFullResourceName())) {
-            throw new MissingCRDException(targetCRDName, null);
-          }
-        }
-      }
       throw new OperatorException("Couldn't register event source named '" + name + "'", e);
     } finally {
       lock.unlock();

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/internal/CustomResourceEventSource.java

@@ -11,10 +11,12 @@
 
 import io.fabric8.kubernetes.api.model.ListOptions;
 import io.fabric8.kubernetes.client.CustomResource;
+import io.fabric8.kubernetes.client.KubernetesClientException;
 import io.fabric8.kubernetes.client.Watch;
 import io.fabric8.kubernetes.client.Watcher;
 import io.fabric8.kubernetes.client.WatcherException;
 import io.fabric8.kubernetes.client.utils.Utils;
+import io.javaoperatorsdk.operator.MissingCRDException;
 import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
 import io.javaoperatorsdk.operator.processing.ConfiguredController;
 import io.javaoperatorsdk.operator.processing.CustomResourceCache;
@@ -55,17 +57,31 @@ public void start() {
       options.setLabelSelector(labelSelector);
     }
 
-    if (ControllerConfiguration.allNamespacesWatched(targetNamespaces)) {
-      var w = client.inAnyNamespace().watch(options, this);
-      watches.add(w);
-      log.debug("Registered {} -> {} for any namespace", controller, w);
-    } else {
-      targetNamespaces.forEach(
-          ns -> {
-            var w = client.inNamespace(ns).watch(options, this);
-            watches.add(w);
-            log.debug("Registered {} -> {} for namespace: {}", controller, w, ns);
-          });
+    try {
+      if (ControllerConfiguration.allNamespacesWatched(targetNamespaces)) {
+        var w = client.inAnyNamespace().watch(options, this);
+        watches.add(w);
+        log.debug("Registered {} -> {} for any namespace", controller, w);
+      } else {
+        targetNamespaces.forEach(
+            ns -> {
+              var w = client.inNamespace(ns).watch(options, this);
+              watches.add(w);
+              log.debug("Registered {} -> {} for namespace: {}", controller, w, ns);
+            });
+      }
+    } catch (Exception e) {
+      if (e instanceof KubernetesClientException) {
+        KubernetesClientException ke = (KubernetesClientException) e;
+        if (404 == ke.getCode()) {
+          // only throw MissingCRDException if the 404 error occurs on the target CRD
+          final var targetCRDName = controller.getConfiguration().getCRDName();
+          if (targetCRDName.equals(ke.getFullResourceName())) {
+            throw new MissingCRDException(targetCRDName, null);
+          }
+        }
+      }
+      throw e;
     }
   }
 

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/DefaultEventSourceManagerTest.java

@@ -9,7 +9,6 @@
 import io.javaoperatorsdk.operator.TestUtils;
 import io.javaoperatorsdk.operator.processing.DefaultEventHandler;
 import io.javaoperatorsdk.operator.processing.KubernetesResourceUtils;
-import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
 
 import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getUID;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -25,8 +24,7 @@ class DefaultEventSourceManagerTest {
 
   private DefaultEventHandler defaultEventHandlerMock = mock(DefaultEventHandler.class);
   private DefaultEventSourceManager defaultEventSourceManager =
-      new DefaultEventSourceManager(defaultEventHandlerMock, false,
-          CustomResource.getCRDName(TestCustomResource.class));
+      new DefaultEventSourceManager(defaultEventHandlerMock, false);
 
   @Test
   public void registersEventSource() {