fix of es mapping

Signed-off-by: Attila Mészáros <csviri@gmail.com>
csviri · Jan 31, 2024 · 833b751 · 833b751
1 parent 2c231ad
commit 833b751
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/io/csviri/operator/resourceflow/reconciler/flow/InformerRegister.java b/src/main/java/io/csviri/operator/resourceflow/reconciler/flow/InformerRegister.java
@@ -92,8 +92,10 @@ public synchronized void deRegisterInformer(GroupVersionKind groupVersionKind,
       Context<ResourceFlow> context) {
     var lastForGVK = unmarkEventSource(groupVersionKind, primary);
     if (lastForGVK) {
-      log.debug("De-registering informer for gvk: {} primary: {}", groupVersionKind, primary);
-      context.eventSourceRetriever().dynamicallyDeRegisterEventSource(groupVersionKind.toString());
+      var es = context.eventSourceRetriever()
+          .dynamicallyDeRegisterEventSource(groupVersionKind.toString());
+      es.ifPresent(i -> log.debug("De-registered informer for gvk: {} primary: {}",
+          groupVersionKind, primary));
     }
   }
 

diff --git a/...csviri/operator/resourceflow/reconciler/flow/RelatedResourceSecondaryToPrimaryMapper.java b/...csviri/operator/resourceflow/reconciler/flow/RelatedResourceSecondaryToPrimaryMapper.java
@@ -18,7 +18,9 @@ public class RelatedResourceSecondaryToPrimaryMapper
 
   @Override
   public Set<ResourceID> toPrimaryResourceIDs(GenericKubernetesResource resource) {
+    // based on if GC or non GC dependent it can have different mapping
     var res = Mappers.fromOwnerReferences(false).toPrimaryResourceIDs(resource);
+    res.addAll(Mappers.fromDefaultAnnotations().toPrimaryResourceIDs(resource));
     // todo empty kind issue
     // var idMapped = secondaryToPrimaryMap.get(
     // new ResourceID(resource.getMetadata().getName(), resource.getMetadata().getNamespace()));