feat: blacklist of problematic resources for previous version annotation

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

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ConfigurationService.java

@@ -1,6 +1,7 @@
 package io.javaoperatorsdk.operator.api.config;
 
 import java.time.Duration;
+import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
@@ -13,6 +14,9 @@
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.Secret;
+import io.fabric8.kubernetes.api.model.apps.Deployment;
+import io.fabric8.kubernetes.api.model.apps.ReplicaSet;
+import io.fabric8.kubernetes.api.model.apps.StatefulSet;
 import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.ConfigBuilder;
 import io.fabric8.kubernetes.client.CustomResource;
@@ -448,6 +452,10 @@ default boolean previousAnnotationForDependentResourcesEventFiltering() {
     return true;
   }
 
+  default List<Class<? extends HasMetadata>> previousAnnotationUsageBlacklist() {
+    return List.of(Deployment.class, StatefulSet.class, ReplicaSet.class);
+  }
+
   /**
    * If the event logic should parse the resourceVersion to determine the ordering of dependent
    * resource events. This is typically not needed.

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ConfigurationServiceOverrider.java

@@ -1,6 +1,7 @@
 package io.javaoperatorsdk.operator.api.config;
 
 import java.time.Duration;
+import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
@@ -40,6 +41,7 @@ public class ConfigurationServiceOverrider {
   private Boolean parseResourceVersions;
   private Boolean useSSAToPatchPrimaryResource;
   private Boolean cloneSecondaryResourcesWhenGettingFromCache;
+  private List<Class<? extends HasMetadata>> previousAnnotationUsageBlacklist;
 
   @SuppressWarnings("rawtypes")
   private DependentResourceFactory dependentResourceFactory;
@@ -188,6 +190,12 @@ public ConfigurationServiceOverrider withCloneSecondaryResourcesWhenGettingFromC
     return this;
   }
 
+  public ConfigurationServiceOverrider previousAnnotationUsageBlacklist(
+      List<Class<? extends HasMetadata>> previousAnnotationUsageBlacklist) {
+    this.previousAnnotationUsageBlacklist = previousAnnotationUsageBlacklist;
+    return this;
+  }
+
   public ConfigurationService build() {
     return new BaseConfigurationService(original.getVersion(), cloner, client) {
       @Override
@@ -328,6 +336,13 @@ public boolean cloneSecondaryResourcesWhenGettingFromCache() {
             cloneSecondaryResourcesWhenGettingFromCache,
             ConfigurationService::cloneSecondaryResourcesWhenGettingFromCache);
       }
+
+      @Override
+      public List<Class<? extends HasMetadata>> previousAnnotationUsageBlacklist() {
+        return overriddenValueOrDefault(
+            previousAnnotationUsageBlacklist,
+            ConfigurationService::previousAnnotationUsageBlacklist);
+      }
     };
   }
 }

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

@@ -40,6 +40,7 @@ public abstract class KubernetesDependentResource<R extends HasMetadata, P exten
   private final boolean garbageCollected = this instanceof GarbageCollected;
   private KubernetesDependentResourceConfig<R> kubernetesDependentResourceConfig;
   private volatile Boolean useSSA;
+  private volatile Boolean usePreviousAnnotationForEventFiltering;
 
   public KubernetesDependentResource(Class<R> resourceType) {
     this(resourceType, null);
@@ -160,10 +161,19 @@ protected boolean useSSA(Context<P> context) {
   }
 
   private boolean usePreviousAnnotation(Context<P> context) {
-    return context
-        .getControllerConfiguration()
-        .getConfigurationService()
-        .previousAnnotationForDependentResourcesEventFiltering();
+    if (usePreviousAnnotationForEventFiltering == null) {
+      usePreviousAnnotationForEventFiltering =
+          context
+                  .getControllerConfiguration()
+                  .getConfigurationService()
+                  .previousAnnotationForDependentResourcesEventFiltering()
+              && !context
+                  .getControllerConfiguration()
+                  .getConfigurationService()
+                  .previousAnnotationUsageBlacklist()
+                  .contains(this.resourceType());
+    }
+    return usePreviousAnnotationForEventFiltering;
   }
 
   @Override