wip

Signed-off-by: Attila Mészáros <a_meszaros@apple.com>

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerManager.java

@@ -230,6 +230,18 @@ private boolean isWatchingAllNamespaces() {
     return sources.containsKey(WATCH_ALL_NAMESPACES);
   }
 
+  public boolean isWatchingNamespace(String namespace) {
+    // for cluster scoped resources we can assume
+    // that we watch the whole cluster
+    if (namespace == null) {
+      return true;
+    }
+    if (isWatchingAllNamespaces()) {
+      return true;
+    }
+    return sources.containsKey(namespace);
+  }
+
   private Optional<InformerWrapper<R>> getSource(String namespace) {
     namespace = isWatchingAllNamespaces() || namespace == null ? WATCH_ALL_NAMESPACES : namespace;
     return Optional.ofNullable(sources.get(namespace));

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/TemporaryResourceCache.java

@@ -188,6 +188,14 @@ public synchronized void putResource(T newResource) {
       return;
     }
 
+    // todo unit test
+    // this can happen when we dynamically change the NS
+    if (!managedInformerEventSource
+        .manager()
+        .isWatchingNamespace(newResource.getMetadata().getNamespace())) {
+      return;
+    }
+
     // check against the latestResourceVersion processed by the TemporaryResourceCache
     // If the resource is older, then we can safely ignore.
     //
@@ -223,6 +231,7 @@ private String getLastSyncResourceVersion(String namespace) {
     return managedInformerEventSource.manager().lastSyncResourceVersion(namespace);
   }
 
+  // todo tests with combination of event processing
   /**
    * There are (probably extremely rare) circumstances, when we can miss a delete event related to a
    * resources: when we create a resource that is deleted right after by third party and the related
@@ -235,9 +244,21 @@ private void checkGhostResources() {
     var iterator = cache.entrySet().iterator();
     while (iterator.hasNext()) {
       var e = iterator.next();
+
+      var ns = e.getValue().getMetadata().getNamespace();
+      // todo unit tests
+      // this can happen if followed namespaces are changed dynamically
+      if (!managedInformerEventSource.manager().isWatchingNamespace(ns)) {
+        log.debug(
+            "Removing resource: {} from cache as part of ghost cleanup. Namespace is not followed"
+                + " anymore: {}",
+            e.getKey(),
+            ns);
+        iterator.remove();
+        continue;
+      }
       if ((ReconcilerUtilsInternal.compareResourceVersions(
-                  e.getValue().getMetadata().getResourceVersion(),
-                  getLastSyncResourceVersion(e.getValue().getMetadata().getNamespace()))
+                  e.getValue().getMetadata().getResourceVersion(), getLastSyncResourceVersion(ns))
               < 0)
           // making sure we have the situation where resource is missing from the cache
           && managedInformerEventSource