IT fix

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java

@@ -67,15 +67,14 @@ private void configureWith(String labelSelector, Set<String> namespaces,
       namespaces = context.getControllerConfiguration().getNamespaces();
     }
 
-    if (eventSource() == null) {
-      var ic = InformerConfiguration.from(resourceType())
-          .withLabelSelector(labelSelector)
-          .withSecondaryToPrimaryMapper(getSecondaryToPrimaryMapper())
-          .withNamespaces(namespaces, inheritNamespacesOnChange)
-          .build();
-
-      configureWith(new InformerEventSource<>(ic, context));
-    }
+    var ic = InformerConfiguration.from(resourceType())
+        .withLabelSelector(labelSelector)
+        .withSecondaryToPrimaryMapper(getSecondaryToPrimaryMapper())
+        .withNamespaces(namespaces, inheritNamespacesOnChange)
+        .build();
+
+    configureWith(new InformerEventSource<>(ic, context));
+
   }
 
   @SuppressWarnings("unchecked")

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multipledependentresource/MultipleDependentResourceReconciler.java

@@ -5,11 +5,12 @@
 
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.client.KubernetesClient;
+import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
 import io.javaoperatorsdk.operator.api.reconciler.*;
 import io.javaoperatorsdk.operator.junit.KubernetesClientAware;
-import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResourceConfig;
 import io.javaoperatorsdk.operator.processing.event.ResourceID;
 import io.javaoperatorsdk.operator.processing.event.source.EventSource;
+import io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource;
 import io.javaoperatorsdk.operator.support.TestExecutionInfoProvider;
 
 @ControllerConfiguration
@@ -31,19 +32,16 @@ public MultipleDependentResourceReconciler() {
 
     secondDependentResourceConfigMap = new MultipleDependentResourceConfigMap(SECOND_CONFIG_MAP_ID);
 
-    firstDependentResourceConfigMap.configureWith(
-        new KubernetesDependentResourceConfig()
-            .setResourceDiscriminator(
-                new ResourceIDMatcherDiscriminator<ConfigMap, MultipleDependentResourceCustomResource>(
-                    p -> new ResourceID(p.getConfigMapName(FIRST_CONFIG_MAP_ID),
-                        p.getMetadata().getNamespace()))));
-
-    secondDependentResourceConfigMap.configureWith(
-        new KubernetesDependentResourceConfig()
-            .setResourceDiscriminator(
-                new ResourceIDMatcherDiscriminator<ConfigMap, MultipleDependentResourceCustomResource>(
-                    p -> new ResourceID(p.getConfigMapName(SECOND_CONFIG_MAP_ID),
-                        p.getMetadata().getNamespace()))));
+    firstDependentResourceConfigMap
+        .setResourceDiscriminator(
+            new ResourceIDMatcherDiscriminator<>(
+                p -> new ResourceID(p.getConfigMapName(FIRST_CONFIG_MAP_ID),
+                    p.getMetadata().getNamespace())));
+    secondDependentResourceConfigMap
+        .setResourceDiscriminator(
+            new ResourceIDMatcherDiscriminator<>(
+                p -> new ResourceID(p.getConfigMapName(SECOND_CONFIG_MAP_ID),
+                    p.getMetadata().getNamespace())));
   }
 
   @Override
@@ -64,9 +62,13 @@ public int getNumberOfExecutions() {
   @Override
   public Map<String, EventSource> prepareEventSources(
       EventSourceContext<MultipleDependentResourceCustomResource> context) {
-    return EventSourceInitializer.nameEventSources(
-        firstDependentResourceConfigMap.initEventSource(context),
-        secondDependentResourceConfigMap.initEventSource(context));
+    InformerEventSource<ConfigMap, MultipleDependentResourceCustomResource> eventSource =
+        new InformerEventSource<>(InformerConfiguration.from(ConfigMap.class, context)
+            .build(), context);
+    firstDependentResourceConfigMap.configureWith(eventSource);
+    secondDependentResourceConfigMap.configureWith(eventSource);
+
+    return EventSourceInitializer.nameEventSources(eventSource);
   }
 
   @Override