comparable resource version only on event source level

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

@@ -44,8 +44,6 @@
 import io.javaoperatorsdk.operator.processing.dependent.workflow.ManagedWorkflowFactory;
 import io.javaoperatorsdk.operator.processing.event.source.controller.ControllerEventSource;
 
-import static io.javaoperatorsdk.operator.api.reconciler.Constants.DEFAULT_COMPARABLE_RESOURCE_VERSION;
-
 /** An interface from which to retrieve configuration information. */
 public interface ConfigurationService {
 
@@ -447,19 +445,6 @@ default Set<Class<? extends HasMetadata>> defaultNonSSAResource() {
     return defaultNonSSAResources();
   }
 
-  /**
-   * If the event logic can compare resourceVersions.
-   *
-   * <p>Enabled by default as Kubernetes does support this interpretation of resourceVersions.
-   * Disable only if your api server provides non comparable resource versions.
-   *
-   * @return if resource versions are comparable
-   * @since 5.3.0
-   */
-  default boolean comparableResourceVersions() {
-    return DEFAULT_COMPARABLE_RESOURCE_VERSION;
-  }
-
   /**
    * {@link io.javaoperatorsdk.operator.api.reconciler.UpdateControl} patch resource or status can
    * either use simple patches or SSA. Setting this to {@code true}, controllers will use SSA for

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

@@ -51,7 +51,6 @@ public class ConfigurationServiceOverrider {
   private Duration reconciliationTerminationTimeout;
   private Boolean ssaBasedCreateUpdateMatchForDependentResources;
   private Set<Class<? extends HasMetadata>> defaultNonSSAResource;
-  private Boolean comparableResourceVersions;
   private Boolean useSSAToPatchPrimaryResource;
   private Boolean cloneSecondaryResourcesWhenGettingFromCache;
 
@@ -166,26 +165,6 @@ public ConfigurationServiceOverrider withDefaultNonSSAResource(
     return this;
   }
 
-  /**
-   * @param value true if internal algorithms can use metadata.resourceVersion as a numeric value.
-   * @return this
-   */
-  public ConfigurationServiceOverrider withComparableResourceVersions(boolean value) {
-    this.comparableResourceVersions = value;
-    return this;
-  }
-
-  /**
-   * @deprecated use withComparableResourceVersions
-   * @param value true if internal algorithms can use metadata.resourceVersion as a numeric value.
-   * @return this
-   */
-  @Deprecated(forRemoval = true)
-  public ConfigurationServiceOverrider withParseResourceVersions(boolean value) {
-    this.comparableResourceVersions = value;
-    return this;
-  }
-
   public ConfigurationServiceOverrider withUseSSAToPatchPrimaryResource(boolean value) {
     this.useSSAToPatchPrimaryResource = value;
     return this;
@@ -330,12 +309,6 @@ public boolean cloneSecondaryResourcesWhenGettingFromCache() {
             cloneSecondaryResourcesWhenGettingFromCache,
             ConfigurationService::cloneSecondaryResourcesWhenGettingFromCache);
       }
-
-      @Override
-      public boolean comparableResourceVersions() {
-        return overriddenValueOrDefault(
-            comparableResourceVersions, ConfigurationService::comparableResourceVersions);
-      }
     };
   }
 }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerEventSource.java

@@ -51,7 +51,7 @@ public ControllerEventSource(Controller<T> controller) {
         NAME,
         controller.getCRClient(),
         controller.getConfiguration(),
-        controller.getConfiguration().getConfigurationService().comparableResourceVersions());
+        controller.getConfiguration().getInformerConfig().isComparableResourceVersions());
     this.controller = controller;
 
     final var config = controller.getConfiguration();

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/createupdateeventfilter/ComparableResourceVersionsDisabledIT.java

@@ -25,8 +25,7 @@ class ComparableResourceVersionsDisabledIT {
   @RegisterExtension
   LocallyRunOperatorExtension operator =
       LocallyRunOperatorExtension.builder()
-          .withReconciler(new CreateUpdateEventFilterTestReconciler())
-          .withConfigurationService(overrider -> overrider.withComparableResourceVersions(false))
+          .withReconciler(new CreateUpdateEventFilterTestReconciler(false))
           .build();
 
   @Test

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/createupdateeventfilter/CreateUpdateEventFilterTestReconciler.java

@@ -41,6 +41,16 @@ public class CreateUpdateEventFilterTestReconciler
   private final DirectConfigMapDependentResource configMapDR =
       new DirectConfigMapDependentResource(ConfigMap.class);
 
+  private final boolean comparableResourceVersion;
+
+  public CreateUpdateEventFilterTestReconciler(boolean comparableResourceVersion) {
+    this.comparableResourceVersion = comparableResourceVersion;
+  }
+
+  public CreateUpdateEventFilterTestReconciler() {
+    this(true);
+  }
+
   @Override
   public UpdateControl<CreateUpdateEventFilterTestCustomResource> reconcile(
       CreateUpdateEventFilterTestCustomResource resource,
@@ -89,6 +99,7 @@ public List<EventSource<?, CreateUpdateEventFilterTestCustomResource>> prepareEv
         InformerEventSourceConfiguration.from(
                 ConfigMap.class, CreateUpdateEventFilterTestCustomResource.class)
             .withLabelSelector("integrationtest = " + this.getClass().getSimpleName())
+            .withComparableResourceVersion(comparableResourceVersion)
             .build();
 
     final var informerEventSource = new InformerEventSource<>(informerConfiguration, context);