test fix

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

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/ResourceOperations.java

@@ -31,6 +31,7 @@
 import io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource;
 import io.javaoperatorsdk.operator.processing.event.source.informer.ManagedInformerEventSource;
 
+import static io.javaoperatorsdk.operator.api.reconciler.Experimental.API_MIGHT_CHANGE;
 import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getUID;
 import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getVersion;
 
@@ -71,6 +72,7 @@ public <R extends HasMetadata> R serverSideApply(R resource) {
     return serverSideApply(resource, (Options) null);
   }
 
+  @Experimental(API_MIGHT_CHANGE)
   public <R extends HasMetadata> R serverSideApply(R resource, Options options) {
     return resourcePatch(
         resource,
@@ -106,6 +108,7 @@ public <R extends HasMetadata> R serverSideApply(
    * @param informerEventSource InformerEventSource to use for resource caching and filtering
    * @param <R> resource type
    */
+  @Experimental(API_MIGHT_CHANGE)
   public <R extends HasMetadata> R serverSideApply(
       R resource, InformerEventSource<R, P> informerEventSource, Options options) {
     if (informerEventSource == null) {
@@ -123,7 +126,8 @@ public <R extends HasMetadata> R serverSideApply(
                         .withFieldManager(context.getControllerConfiguration().fieldManager())
                         .withPatchType(PatchType.SERVER_SIDE_APPLY)
                         .build()),
-        informerEventSource);
+        informerEventSource,
+        options);
   }
 
   /**
@@ -235,6 +239,7 @@ public <R extends HasMetadata> R update(R resource) {
    * @return updated resource
    * @param <R> resource type
    */
+  @Experimental(API_MIGHT_CHANGE)
   public <R extends HasMetadata> R update(R resource, Options options) {
     return resourcePatch(resource, r -> context.getClient().resource(r).update(), options);
   }
@@ -258,6 +263,7 @@ public <R extends HasMetadata> R update(
    * @param informerEventSource InformerEventSource to use for resource caching and filtering
    * @param <R> resource type
    */
+  @Experimental(API_MIGHT_CHANGE)
   public <R extends HasMetadata> R update(
       R resource, InformerEventSource<R, P> informerEventSource, Options options) {
     if (informerEventSource == null) {
@@ -557,6 +563,7 @@ public <R extends HasMetadata> R resourcePatch(R resource, UnaryOperator<R> upda
    * @param <R> resource type
    * @throws IllegalStateException if no event source or multiple event sources are found
    */
+  @Experimental(API_MIGHT_CHANGE)
   @SuppressWarnings({"rawtypes", "unchecked"})
   public <R extends HasMetadata> R resourcePatch(
       R resource, UnaryOperator<R> updateOperation, Options options) {
@@ -794,10 +801,11 @@ public P addFinalizerWithSSA(String finalizerName) {
     }
   }
 
-  @Experimental("This API might change")
   /**
    * Force filtering only if it is made sure that the update not results on a no-op change. See
-   * details here: https://github.com/operator-framework/java-operator-sdk/pull/3484
+   * details here: <a href="https://github.com/operator-framework/java-operator-sdk/pull/3484">PR
+   * 3484</a>
    */
+  @Experimental("This API might change")
   public record Options(boolean forceEventFiltering) {}
 }

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/readcacheafterwrite/onrelistfilter/OnRelistFilterReconciler.java

@@ -34,6 +34,7 @@
 import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
 import io.javaoperatorsdk.operator.api.reconciler.EventSourceContext;
 import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
+import io.javaoperatorsdk.operator.api.reconciler.ResourceOperations;
 import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
 import io.javaoperatorsdk.operator.processing.event.ResourceID;
 import io.javaoperatorsdk.operator.processing.event.source.EventSource;
@@ -79,7 +80,10 @@ public UpdateControl<OnRelistFilterCustomResource> reconcile(
     if (execution == 1) {
       var cm = prepareConfigMap(resource);
       switch (mode.get()) {
-        case NO_RELIST -> context.resourceOperations().serverSideApply(cm, configMapEventSource);
+        case NO_RELIST ->
+            context
+                .resourceOperations()
+                .serverSideApply(cm, configMapEventSource, new ResourceOperations.Options(true));
         case RELIST_AROUND_UPDATE -> {
           configMapEventSource.simulateOnBeforeList();
           var applied = context.resourceOperations().serverSideApply(cm, configMapEventSource);
@@ -94,7 +98,9 @@ public UpdateControl<OnRelistFilterCustomResource> reconcile(
         case RELIST_COMPLETES_BEFORE_UPDATE -> {
           configMapEventSource.simulateOnBeforeList();
           configMapEventSource.simulateOnList();
-          context.resourceOperations().serverSideApply(cm, configMapEventSource);
+          context
+              .resourceOperations()
+              .serverSideApply(cm, configMapEventSource, new ResourceOperations.Options(true));
         }
         case RELIST_STARTS_DURING_UPDATE -> {
           // Drive the event-filtering update path manually so we can fire onBeforeList AFTER the
@@ -114,7 +120,8 @@ public UpdateControl<OnRelistFilterCustomResource> reconcile(
                                 .withFieldManager(fieldManager)
                                 .withPatchType(PatchType.SERVER_SIDE_APPLY)
                                 .build());
-                  });
+                  },
+                  true);
           // See RELIST_AROUND_UPDATE: wait for the own-write event to be buffered while the
           // re-list is still in progress, so it is tagged as part of the re-list and propagated.
           configMapEventSource.awaitWatchEventReceived(applied);