fix: only throw MissingCRDException if we get a 404 on the target CRD

Fixes #552

Author: metacosm

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

@@ -24,7 +24,7 @@
 /**
  * Dispatches events to the Controller and handles Finalizers for a single type of Custom Resource.
  */
-class EventDispatcher<R extends CustomResource<?, ?>> {
+public class EventDispatcher<R extends CustomResource<?, ?>> {
 
   private static final Logger log = LoggerFactory.getLogger(EventDispatcher.class);
 

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

@@ -35,18 +35,21 @@ 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) {
+  DefaultEventSourceManager(DefaultEventHandler<R> defaultEventHandler, boolean supportRetry,
+      String targetCRDName) {
     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);
+    this(new DefaultEventHandler<>(controller), true, controller.getConfiguration().getCRDName());
     registerEventSource(CUSTOM_RESOURCE_EVENT_SOURCE_NAME,
         new CustomResourceEventSource<>(controller));
   }
@@ -92,7 +95,10 @@ public final void registerEventSource(String name, EventSource eventSource)
       if (e instanceof KubernetesClientException) {
         KubernetesClientException ke = (KubernetesClientException) e;
         if (404 == ke.getCode()) {
-          throw new MissingCRDException(null, null);
+          // 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);

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

@@ -9,6 +9,7 @@
 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;
@@ -24,7 +25,8 @@ class DefaultEventSourceManagerTest {
 
   private DefaultEventHandler defaultEventHandlerMock = mock(DefaultEventHandler.class);
   private DefaultEventSourceManager defaultEventSourceManager =
-      new DefaultEventSourceManager(defaultEventHandlerMock, false);
+      new DefaultEventSourceManager(defaultEventHandlerMock, false,
+          CustomResource.getCRDName(TestCustomResource.class));
 
   @Test
   public void registersEventSource() {

pom.xml

@@ -41,7 +41,7 @@
         <maven.compiler.target>${java.version}</maven.compiler.target>
 
         <junit.version>5.8.1</junit.version>
-        <fabric8-client.version>5.7.2</fabric8-client.version>
+        <fabric8-client.version>5.8.0</fabric8-client.version>
         <slf4j.version>1.7.32</slf4j.version>
         <log4j.version>2.14.1</log4j.version>
         <mokito.version>3.12.4</mokito.version>