wip

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

@@ -145,7 +145,7 @@ public <R extends HasMetadata> R serverSideApply(
    * @return updated resource
    * @param <R> resource type
    */
-  public <R extends HasMetadata> R serverSideApplyStatus(R resource) {
+  public <R extends HasMetadata> R serverSideApplyStatus(R resource, Options options) {
     return resourcePatch(
         resource,
         r ->
@@ -158,7 +158,12 @@ public <R extends HasMetadata> R serverSideApplyStatus(R resource) {
                         .withForce(true)
                         .withFieldManager(context.getControllerConfiguration().fieldManager())
                         .withPatchType(PatchType.SERVER_SIDE_APPLY)
-                        .build()));
+                        .build()),
+        options);
+  }
+
+  public <R extends HasMetadata> R serverSideApplyStatus(R resource) {
+    return serverSideApplyStatus(resource, null);
   }
 
   /**
@@ -246,7 +251,7 @@ public <R extends HasMetadata> R update(R resource, Options options) {
 
   public <R extends HasMetadata> R update(
       R resource, InformerEventSource<R, P> informerEventSource) {
-    return update(resource, informerEventSource, null);
+    return update(resource, informerEventSource, new Options(true));
   }
 
   /**
@@ -334,7 +339,8 @@ public <R extends HasMetadata> R create(
    * @param <R> resource type
    */
   public <R extends HasMetadata> R updateStatus(R resource) {
-    return resourcePatch(resource, r -> context.getClient().resource(r).updateStatus());
+    return resourcePatch(
+        resource, r -> context.getClient().resource(r).updateStatus(), new Options(true));
   }
 
   /**
@@ -397,7 +403,13 @@ public P updatePrimaryStatus(P resource) {
    * @param <R> resource type
    */
   public <R extends HasMetadata> R jsonPatch(R resource, UnaryOperator<R> unaryOperator) {
-    return resourcePatch(resource, r -> context.getClient().resource(r).edit(unaryOperator));
+    return jsonPatch(resource, unaryOperator, null);
+  }
+
+  public <R extends HasMetadata> R jsonPatch(
+      R resource, UnaryOperator<R> unaryOperator, Options options) {
+    return resourcePatch(
+        resource, r -> context.getClient().resource(r).edit(unaryOperator), options);
   }
 
   /**
@@ -417,8 +429,14 @@ public <R extends HasMetadata> R jsonPatch(R resource, UnaryOperator<R> unaryOpe
    * @return updated resource
    * @param <R> resource type
    */
+  public <R extends HasMetadata> R jsonPatchStatus(
+      R resource, UnaryOperator<R> unaryOperator, Options options) {
+    return resourcePatch(
+        resource, r -> context.getClient().resource(r).editStatus(unaryOperator), options);
+  }
+
   public <R extends HasMetadata> R jsonPatchStatus(R resource, UnaryOperator<R> unaryOperator) {
-    return resourcePatch(resource, r -> context.getClient().resource(r).editStatus(unaryOperator));
+    return jsonPatchStatus(resource, unaryOperator, null);
   }
 
   /**
@@ -482,7 +500,11 @@ public P jsonPatchPrimaryStatus(P resource, UnaryOperator<P> unaryOperator) {
    * @param <R> resource type
    */
   public <R extends HasMetadata> R jsonMergePatch(R resource) {
-    return resourcePatch(resource, r -> context.getClient().resource(r).patch());
+    return jsonMergePatch(resource, null);
+  }
+
+  public <R extends HasMetadata> R jsonMergePatch(R resource, Options options) {
+    return resourcePatch(resource, r -> context.getClient().resource(r).patch(), options);
   }
 
   /**
@@ -501,7 +523,11 @@ public <R extends HasMetadata> R jsonMergePatch(R resource) {
    * @param <R> resource type
    */
   public <R extends HasMetadata> R jsonMergePatchStatus(R resource) {
-    return resourcePatch(resource, r -> context.getClient().resource(r).patchStatus());
+    return jsonMergePatchStatus(resource, null);
+  }
+
+  public <R extends HasMetadata> R jsonMergePatchStatus(R resource, Options options) {
+    return resourcePatch(resource, r -> context.getClient().resource(r).patchStatus(), options);
   }
 
   /**

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/changenamespace/ChangeNamespaceTestReconciler.java

@@ -53,7 +53,9 @@ public UpdateControl<ChangeNamespaceTestCustomResource> reconcile(
       ChangeNamespaceTestCustomResource primary,
       Context<ChangeNamespaceTestCustomResource> context) {
 
-    context.resourceOperations().serverSideApply(configMap(primary));
+    context
+        .resourceOperations()
+        .serverSideApply(configMap(primary), new ResourceOperations.Options(true));
 
     if (primary.getStatus() == null) {
       primary.setStatus(new ChangeNamespaceTestCustomResourceStatus());

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/readcacheafterwrite/ownsecondaryupdate/OwnSecondaryUpdateReconciler.java

@@ -27,6 +27,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.source.EventSource;
 import io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource;
@@ -50,7 +51,10 @@ public UpdateControl<OwnSecondaryUpdateCustomResource> reconcile(
     // version actually advances. With the read-cache-after-write filter in place, none of the
     // resulting watch events should trigger a fresh reconciliation.
     for (int i = 1; i <= OWN_SSA_COUNT; i++) {
-      context.resourceOperations().serverSideApply(prepareCM(resource, i), configMapEventSource);
+      context
+          .resourceOperations()
+          .serverSideApply(
+              prepareCM(resource, i), configMapEventSource, new ResourceOperations.Options(true));
     }
     return UpdateControl.noUpdate();
   }