wip

Signed-off-by: Attila Mészáros <[email protected]>

Author: csviri

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

@@ -0,0 +1,30 @@
+/*
+ * Copyright Java Operator SDK Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.javaoperatorsdk.operator.api.reconciler;
+
+public abstract class AbstractUpdateControl<T extends BaseControl<T>> extends BaseControl<T> {
+
+  private boolean filterPatchEvent = true;
+
+  public T filterPatchEvent(boolean filterPatchEvent) {
+    this.filterPatchEvent = filterPatchEvent;
+    return (T) this;
+  }
+
+  public boolean isFilterPatchEvent() {
+    return filterPatchEvent;
+  }
+}

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

@@ -21,7 +21,7 @@
 import io.fabric8.kubernetes.api.model.HasMetadata;
 
 public class ErrorStatusUpdateControl<P extends HasMetadata>
-    extends BaseControl<ErrorStatusUpdateControl<P>> {
+    extends AbstractUpdateControl<ErrorStatusUpdateControl<P>> {
 
   private final P resource;
   private boolean noRetry = false;

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

@@ -20,7 +20,7 @@
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.client.CustomResource;
 
-public class UpdateControl<P extends HasMetadata> extends BaseControl<UpdateControl<P>> {
+public class UpdateControl<P extends HasMetadata> extends AbstractUpdateControl<UpdateControl<P>> {
 
   private final P resource;
   private final boolean patchResource;

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/ReconciliationDispatcher.java

@@ -23,7 +23,6 @@
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.KubernetesResourceList;
-import io.fabric8.kubernetes.api.model.Namespaced;
 import io.fabric8.kubernetes.client.KubernetesClientException;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
@@ -188,7 +187,8 @@ private PostExecutionControl<P> reconcileExecution(
     }
 
     if (updateControl.isPatchResource()) {
-      updatedCustomResource = patchResource(context, toUpdate, originalResource);
+      updatedCustomResource =
+          patchResource(context, toUpdate, originalResource, updateControl.isFilterPatchEvent());
       if (!useSSA) {
         toUpdate
             .getMetadata()
@@ -197,7 +197,8 @@ private PostExecutionControl<P> reconcileExecution(
     }
 
     if (updateControl.isPatchStatus()) {
-      customResourceFacade.patchStatus(context, toUpdate, originalResource);
+      customResourceFacade.patchStatus(
+          context, toUpdate, originalResource, updateControl.isFilterPatchEvent());
     }
     return createPostExecutionControl(updatedCustomResource, updateControl, executionScope);
   }
@@ -235,7 +236,10 @@ public boolean isLastAttempt() {
       try {
         updatedResource =
             customResourceFacade.patchStatus(
-                context, errorStatusUpdateControl.getResource().orElseThrow(), originalResource);
+                context,
+                errorStatusUpdateControl.getResource().orElseThrow(),
+                originalResource,
+                errorStatusUpdateControl.isFilterPatchEvent());
       } catch (Exception ex) {
         int code = ex instanceof KubernetesClientException kcex ? kcex.getCode() : -1;
         Level exceptionLevel = Level.ERROR;
@@ -341,7 +345,7 @@ private PostExecutionControl<P> handleCleanup(
     return postExecutionControl;
   }
 
-  private P patchResource(Context<P> context, P resource, P originalResource) {
+  private P patchResource(Context<P> context, P resource, P originalResource, boolean filterEvent) {
     log.debug(
         "Updating resource: {} with version: {}; SSA: {}",
         getUID(resource),
@@ -354,7 +358,7 @@ private P patchResource(Context<P> context, P resource, P originalResource) {
       // addFinalizer already prevents adding an already present finalizer so no need to check
       resource.addFinalizer(finalizerName);
     }
-    return customResourceFacade.patchResource(context, resource, originalResource);
+    return customResourceFacade.patchResource(context, resource, originalResource, filterEvent);
   }
 
   ControllerConfiguration<P> configuration() {
@@ -394,40 +398,38 @@ public R getResource(String namespace, String name) {
       }
     }
 
-    public R patchResourceWithoutSSA(R resource, R originalResource) {
-      return resource(originalResource).edit(r -> resource);
-    }
-
-    public R patchResource(Context<R> context, R resource, R originalResource) {
+    public R patchResource(
+        Context<R> context, R resource, R originalResource, boolean filterEvent) {
       if (log.isDebugEnabled()) {
         log.debug(
             "Trying to replace resource {}, version: {}",
             ResourceID.fromResource(resource),
             resource.getMetadata().getResourceVersion());
       }
       if (useSSA) {
-        return ReconcileUtils.serverSideApplyPrimary(context, resource);
+        return ReconcileUtils.serverSideApplyPrimary(context, resource, filterEvent);
       } else {
-        return ReconcileUtils.jsonPatchPrimary(context, originalResource, r -> resource);
+        return ReconcileUtils.jsonPatchPrimary(
+            context, originalResource, r -> resource, filterEvent);
       }
     }
 
-    public R patchStatus(Context<R> context, R resource, R originalResource) {
+    public R patchStatus(Context<R> context, R resource, R originalResource, boolean filterEvent) {
       log.trace("Patching status for resource: {} with ssa: {}", resource, useSSA);
       if (useSSA) {
         var managedFields = resource.getMetadata().getManagedFields();
         try {
           resource.getMetadata().setManagedFields(null);
-          return ReconcileUtils.serverSideApplyPrimaryStatus(context, resource);
+          return ReconcileUtils.serverSideApplyPrimaryStatus(context, resource, filterEvent);
         } finally {
           resource.getMetadata().setManagedFields(managedFields);
         }
       } else {
-        return editStatus(context, resource, originalResource);
+        return editStatus(context, resource, originalResource, filterEvent);
       }
     }
 
-    private R editStatus(Context<R> context, R resource, R originalResource) {
+    private R editStatus(Context<R> context, R resource, R originalResource, boolean filterEvent) {
       String resourceVersion = resource.getMetadata().getResourceVersion();
       // the cached resource should not be changed in any circumstances
       // that can lead to all kinds of race conditions.
@@ -441,19 +443,14 @@ private R editStatus(Context<R> context, R resource, R originalResource) {
             r -> {
               ReconcilerUtilsInternal.setStatus(r, ReconcilerUtilsInternal.getStatus(resource));
               return r;
-            });
+            },
+            filterEvent);
       } finally {
         // restore initial resource version
         clonedOriginal.getMetadata().setResourceVersion(resourceVersion);
         resource.getMetadata().setResourceVersion(resourceVersion);
       }
     }
-
-    private Resource<R> resource(R resource) {
-      return resource instanceof Namespaced
-          ? resourceOperation.inNamespace(resource.getMetadata().getNamespace()).resource(resource)
-          : resourceOperation.resource(resource);
-    }
   }
 
   private boolean triggerOnAllEvents() {

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/reconciler/ReconcileUtilsTest.java

@@ -76,4 +76,9 @@ public void compareResourcePerformanceTest() {
 
     assertThat(dur1).isLessThan(dur2);
   }
+
+  @Test
+  void retriesAddingFinalizerWithoutSSA() {
+    // todo
+  }
 }