wip

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

Author: csviri

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/ssaissue/finalizer/SSAFinalizerIssueIT.java

@@ -1,9 +1,13 @@
 package io.javaoperatorsdk.operator.baseapi.ssaissue.finalizer;
 
+import java.util.List;
+
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
+import io.fabric8.kubernetes.client.dsl.base.PatchContext;
+import io.fabric8.kubernetes.client.dsl.base.PatchType;
 import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -20,20 +24,34 @@ class SSAFinalizerIssueIT {
           .build();
 
   /**
-   * Showcases the problem when we add a finalizer and in the spec a list is initialized with an
-   * empty list by default. This at the end results in a change that when adding the finalizer, the
-   * SSA patch deletes the initial values in the spec.
+   * Showcases possibly a case with SSA: When the resource is created with the same field manager
+   * that used by the controller, when adding a finalizer, it deletes other parts of the spec.
    */
   @Test
   void addingFinalizerRemoveListValues() {
-    operator.create(testResource());
+    var fieldManager =
+        operator
+            .getRegisteredControllerForReconcile(SSAFinalizerIssueReconciler.class)
+            .getConfiguration()
+            .fieldManager();
+
+    operator
+        .getKubernetesClient()
+        .resource(testResource())
+        .inNamespace(operator.getNamespace())
+        .patch(
+            new PatchContext.Builder()
+                .withFieldManager(fieldManager)
+                .withForce(true)
+                .withPatchType(PatchType.SERVER_SIDE_APPLY)
+                .build());
 
     await()
         .untilAsserted(
             () -> {
               var actual = operator.get(SSAFinalizerIssueCustomResource.class, TEST_1);
               assertThat(actual.getFinalizers()).hasSize(1);
-              assertThat(actual.getSpec().getList()).isEmpty();
+              assertThat(actual.getSpec()).isNull();
             });
   }
 
@@ -42,6 +60,7 @@ SSAFinalizerIssueCustomResource testResource() {
     res.setMetadata(new ObjectMetaBuilder().withName(TEST_1).build());
     res.setSpec(new SSAFinalizerIssueSpec());
     res.getSpec().setValue("val");
+    res.getSpec().setList(List.of("val1", "val2"));
     return res;
   }
 }

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/ssaissue/finalizer/SSAFinalizerIssueSpec.java

@@ -1,15 +1,12 @@
 package io.javaoperatorsdk.operator.baseapi.ssaissue.finalizer;
 
-import java.util.ArrayList;
 import java.util.List;
 
 public class SSAFinalizerIssueSpec {
 
   private String value;
 
-  // List is initialized, that at the end becomes problematic when adding the finalizer
-  // If the list is not initialized like this (this its null) it works fine
-  private List<String> list = new ArrayList<>();
+  private List<String> list = null;
 
   public String getValue() {
     return value;