informer restart

Signed-off-by: Attila Mészáros <[email protected]>

Author: csviri

Diff for: operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerEventSource.java

@@ -312,16 +312,16 @@ private boolean acceptedByDeleteFilters(R resource, boolean b) {
   public void setConfigurationService(ConfigurationService configurationService) {
     super.setConfigurationService(configurationService);
 
-    super.addIndexers(indexerBuffer);
+    super.addIndexers(indexerBuffer); // todo check
     indexerBuffer = new HashMap<>();
   }
 
   @Override
   public void addIndexers(Map<String, Function<R, List<String>>> indexers) {
-    if (indexerBuffer == null) {
+    if (isRunning()) {
       throw new OperatorException("Cannot add indexers after InformerEventSource started.");
     }
-    indexerBuffer.putAll(indexers);
+    indexerBuffer.putAll(indexers); // todo check
   }
 
   /**

Diff for: operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/ManagedInformerEventSource.java

@@ -1,9 +1,6 @@
 package io.javaoperatorsdk.operator.processing.event.source.informer;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
+import java.util.*;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
@@ -36,17 +33,21 @@ public abstract class ManagedInformerEventSource<R extends HasMetadata, P extend
     InformerWrappingEventSourceHealthIndicator<R>, Configurable<C> {
 
   private static final Logger log = LoggerFactory.getLogger(ManagedInformerEventSource.class);
-  private final InformerManager<R, C> cache;
+  private InformerManager<R, C> cache;
+  private boolean parseResourceVersions;
+  private ConfigurationService configurationService;
+  private C configuration;
+  private Map<String, Function<R, List<String>>> indexers = new HashMap<>();
   protected TemporaryResourceCache<R> temporaryResourceCache;
   protected MixedOperation<R, KubernetesResourceList<R>, Resource<R>> client;
 
   protected ManagedInformerEventSource(
       MixedOperation<R, KubernetesResourceList<R>, Resource<R>> client, C configuration,
       boolean parseResourceVersions) {
     super(configuration.getResourceClass());
+    this.parseResourceVersions = parseResourceVersions;
     this.client = client;
-    temporaryResourceCache = new TemporaryResourceCache<>(this, parseResourceVersions);
-    this.cache = new InformerManager<>(client, configuration, this);
+    this.configuration = configuration;
   }
 
   @Override
@@ -77,6 +78,10 @@ public void changeNamespaces(Set<String> namespaces) {
 
   @Override
   public void start() {
+    temporaryResourceCache = new TemporaryResourceCache<>(this, parseResourceVersions);
+    this.cache = new InformerManager<>(client, configuration, this);
+    cache.setConfigurationService(configurationService);
+    cache.addIndexers(indexers);
     manager().start();
     super.start();
   }
@@ -129,7 +134,7 @@ void setTemporalResourceCache(TemporaryResourceCache<R> temporaryResourceCache)
 
   @Override
   public void addIndexers(Map<String, Function<R, List<String>>> indexers) {
-    cache.addIndexers(indexers);
+    this.indexers.putAll(indexers);
   }
 
   @Override
@@ -175,6 +180,6 @@ public String toString() {
   }
 
   public void setConfigurationService(ConfigurationService configurationService) {
-    cache.setConfigurationService(configurationService);
+    this.configurationService = configurationService;
   }
 }

Diff for: operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerResourceEventSourceTest.java

@@ -37,7 +37,7 @@ class ControllerResourceEventSourceTest extends
 
   @BeforeEach
   public void setup() {
-    setUpSource(new ControllerResourceEventSource<>(testController), false,
+    setUpSource(new ControllerResourceEventSource<>(testController), true,
         new BaseConfigurationService());
   }
 

Diff for: operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerEventSourceTest.java

@@ -55,15 +55,16 @@ void setup() {
     when(informerConfiguration.getResourceClass()).thenReturn(Deployment.class);
 
     informerEventSource = new InformerEventSource<>(informerConfiguration, clientMock);
-    informerEventSource.setTemporalResourceCache(temporaryResourceCacheMock);
-    informerEventSource.setEventHandler(eventHandlerMock);
-
 
+    informerEventSource.setEventHandler(eventHandlerMock);
+    informerEventSource.setConfigurationService(new BaseConfigurationService());
     SecondaryToPrimaryMapper secondaryToPrimaryMapper = mock(SecondaryToPrimaryMapper.class);
     when(informerConfiguration.getSecondaryToPrimaryMapper())
         .thenReturn(secondaryToPrimaryMapper);
     when(secondaryToPrimaryMapper.toPrimaryResourceIDs(any()))
         .thenReturn(Set.of(ResourceID.fromResource(testDeployment())));
+    informerEventSource.start();
+    informerEventSource.setTemporalResourceCache(temporaryResourceCacheMock);
   }
 
   @Test