IT

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

Author: csviri

src/main/java/io/javaoperatorsdk/operator/glue/reconciler/glue/GlueReconciler.java

@@ -48,19 +48,17 @@ public class GlueReconciler implements Reconciler<Glue>, Cleaner<Glue>, ErrorSta
 
   private final ValidationAndErrorHandler validationAndErrorHandler;
   private final InformerRegister informerRegister;
-  private final GenericTemplateHandler templateHandler;
 
   private final KubernetesResourceDeletedCondition deletePostCondition =
       new KubernetesResourceDeletedCondition();
 
   private final GenericTemplateHandler genericTemplateHandler;
 
   public GlueReconciler(ValidationAndErrorHandler validationAndErrorHandler,
-      InformerRegister informerRegister, GenericTemplateHandler templateHandler,
+      InformerRegister informerRegister,
       GenericTemplateHandler genericTemplateHandler) {
     this.validationAndErrorHandler = validationAndErrorHandler;
     this.informerRegister = informerRegister;
-    this.templateHandler = templateHandler;
     this.genericTemplateHandler = genericTemplateHandler;
   }
 
@@ -234,7 +232,7 @@ private void patchRelatedResourcesStatus(Context<Glue> context,
         .filter(r -> r.getStatusPatch() != null || r.getStatusPatchTemplate() != null)
         .toList();
 
-    if (!targetRelatedResources.isEmpty()) {
+    if (targetRelatedResources.isEmpty()) {
       return;
     }
     var actualData = genericTemplateHandler.createDataWithResources(primary, context);

src/main/java/io/javaoperatorsdk/operator/glue/templating/GenericTemplateHandler.java

@@ -4,6 +4,7 @@
 import java.util.Map;
 
 import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
+import io.fabric8.kubernetes.client.utils.Serialization;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.glue.Utils;
 import io.javaoperatorsdk.operator.glue.customresource.glue.Glue;
@@ -62,10 +63,9 @@ public String processTemplate(String template, Glue primary,
     return res;
   }
 
-  // todo unit test
   @SuppressWarnings("unchecked")
   public static Map<String, ?> parseTemplateToMapObject(String template) {
-    return objectMapper.convertValue(template, Map.class);
+    return Serialization.unmarshal(template, Map.class);
   }
 
 }

src/test/java/io/javaoperatorsdk/operator/glue/GlueTest.java

@@ -14,6 +14,7 @@
 import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
 import io.fabric8.kubernetes.api.model.Secret;
 import io.fabric8.kubernetes.client.dsl.NonDeletingOperation;
+import io.javaoperatorsdk.operator.glue.customresource.TestCustomResource;
 import io.javaoperatorsdk.operator.glue.customresource.glue.DependentResourceSpec;
 import io.javaoperatorsdk.operator.glue.customresource.glue.Glue;
 import io.javaoperatorsdk.operator.glue.reconciler.ValidationAndErrorHandler;
@@ -324,6 +325,33 @@ void clusterScopedRelatedResource() {
     });
   }
 
+  @Test
+  void pathRelatedResourceStatus() {
+    TestUtils.applyTestCrd(client, TestCustomResource.class);
+
+    var customResource = create(TestData.testCustomResource());
+    var glue = createGlue("/glue/PatchRelatedStatus.yaml");
+
+    await().untilAsserted(() -> {
+      var cm = get(ConfigMap.class, "configmap1");
+      assertThat(cm).isNotNull();
+      var cr = get(TestCustomResource.class, "testcr1");
+      assertThat(cr.getStatus()).isNotNull();
+      assertThat(cr.getStatus().getValue()).isEqualTo(cm.getMetadata().getResourceVersion());
+    });
+
+    delete(glue);
+
+    await().timeout(TestUtils.GC_WAIT_TIMEOUT).untilAsserted(() -> {
+      var cm = get(ConfigMap.class, "configmap1");
+      assertThat(cm).isNull();
+    });
+
+    delete(customResource);
+  }
+
+
+
   private List<Glue> testWorkflowList(int num) {
     List<Glue> res = new ArrayList<>();
     IntStream.range(0, num).forEach(index -> {

src/test/java/io/javaoperatorsdk/operator/glue/TestBase.java

@@ -13,9 +13,11 @@
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.dsl.NonDeletingOperation;
 import io.fabric8.kubernetes.client.utils.KubernetesResourceUtil;
+import io.javaoperatorsdk.operator.glue.customresource.glue.Glue;
 
 import jakarta.inject.Inject;
 
+import static io.javaoperatorsdk.operator.glue.TestUtils.loadGlue;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 
@@ -51,6 +53,10 @@ protected Namespace testNamespace(String name) {
         .build()).build();
   }
 
+  protected Glue createGlue(String path) {
+    return create(loadGlue(path));
+  }
+
   protected <T extends HasMetadata> T create(T resource) {
     return client.resource(resource).inNamespace(testNamespace).create();
   }

src/test/resources/glue/PatchRelatedStatus.yaml

@@ -0,0 +1,21 @@
+apiVersion: io.javaoperatorsdk.operator.glue/v1beta1
+kind: Glue
+metadata:
+  name: related-resource-status-patch
+spec:
+  childResources:
+    - name: configMap1
+      resource:
+        apiVersion: v1
+        kind: ConfigMap
+        metadata:
+          name: configmap1
+        data:
+          key: "value"
+  relatedResources:
+    - name: related
+      apiVersion: "io.javaoperatorsdk.operator.glue/v1"
+      kind: TestCustomResource
+      resourceNames: ["testcr1"]
+      statusPatch:
+        value: "{configMap1.metadata.resourceVersion}"