diff --git a/operator-framework/pom.xml b/operator-framework/pom.xml index 18cbda43cf..761bda80bd 100644 --- a/operator-framework/pom.xml +++ b/operator-framework/pom.xml @@ -63,6 +63,12 @@ openshift-client-api test + + io.fabric8 + crd-generator-api-v2 + test + + org.apache.logging.log4j log4j-slf4j2-impl diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/simple/ReconcilerExecutorIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/simple/ReconcilerExecutorIT.java index cbd8de4459..d19a495184 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/simple/ReconcilerExecutorIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/simple/ReconcilerExecutorIT.java @@ -1,6 +1,7 @@ package io.javaoperatorsdk.operator.baseapi.simple; import java.time.Duration; +import java.util.Map; import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; @@ -10,6 +11,8 @@ import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension; import io.javaoperatorsdk.operator.support.TestUtils; +import com.fasterxml.jackson.databind.ObjectMapper; + import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -21,10 +24,12 @@ class ReconcilerExecutorIT { @Test void configMapGetsCreatedForTestCustomResource() { + var om = new ObjectMapper(); operator.getReconcilerOfType(TestReconciler.class).setUpdateStatus(true); TestCustomResource resource = TestUtils.testCustomResource(); - operator.create(resource); + resource.getSpec().setSomeValue(om.valueToTree(Map.of("k", "v"))); + var res = operator.create(resource); awaitResourcesCreatedOrUpdated(); awaitStatusUpdated(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/simple/TestCustomResourceSpec.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/simple/TestCustomResourceSpec.java index eda3c477b2..54de517216 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/simple/TestCustomResourceSpec.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/simple/TestCustomResourceSpec.java @@ -1,5 +1,7 @@ package io.javaoperatorsdk.operator.baseapi.simple; +import com.fasterxml.jackson.databind.JsonNode; + public class TestCustomResourceSpec { private String configMapName; @@ -8,6 +10,16 @@ public class TestCustomResourceSpec { private String value; + private JsonNode someValue; + + public JsonNode getSomeValue() { + return someValue; + } + + public void setSomeValue(JsonNode value) { + this.someValue = value; + } + public String getConfigMapName() { return configMapName; }