Skip to content

Commit 981d1c3

Browse files
committed
wip
Signed-off-by: Attila Mészáros <[email protected]>
1 parent 78b56a7 commit 981d1c3

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

operator-framework/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,12 @@
6363
<artifactId>openshift-client-api</artifactId>
6464
<scope>test</scope>
6565
</dependency>
66+
<dependency>
67+
<groupId>io.fabric8</groupId>
68+
<artifactId>crd-generator-api-v2</artifactId>
69+
<scope>test</scope>
70+
</dependency>
71+
6672
<dependency>
6773
<groupId>org.apache.logging.log4j</groupId>
6874
<artifactId>log4j-slf4j2-impl</artifactId>

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/simple/ReconcilerExecutorIT.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.javaoperatorsdk.operator.baseapi.simple;
22

33
import java.time.Duration;
4+
import java.util.Map;
45
import java.util.concurrent.TimeUnit;
56

67
import org.junit.jupiter.api.Test;
@@ -24,8 +25,8 @@ void configMapGetsCreatedForTestCustomResource() {
2425
operator.getReconcilerOfType(TestReconciler.class).setUpdateStatus(true);
2526

2627
TestCustomResource resource = TestUtils.testCustomResource();
27-
// resource.getSpec()
28-
operator.create(resource);
28+
resource.getSpec().setSomeValue(Map.of("key1", Map.of("key2", "value2")));
29+
var res = operator.create(resource);
2930

3031
awaitResourcesCreatedOrUpdated();
3132
awaitStatusUpdated();

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/simple/TestCustomResourceSpec.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package io.javaoperatorsdk.operator.baseapi.simple;
22

3-
import com.fasterxml.jackson.annotation.JsonAnyGetter;
4-
import com.fasterxml.jackson.annotation.JsonAnySetter;
5-
import com.fasterxml.jackson.databind.JsonNode;
3+
import java.util.Map;
4+
5+
import io.fabric8.crd.generator.annotation.PreserveUnknownFields;
66

77
public class TestCustomResourceSpec {
88

@@ -12,15 +12,13 @@ public class TestCustomResourceSpec {
1212

1313
private String value;
1414

15-
private JsonNode someValue;
15+
@PreserveUnknownFields private Map<String, Object> someValue;
1616

17-
@JsonAnyGetter
18-
public JsonNode getSomeValue() {
17+
public Map<String, Object> getSomeValue() {
1918
return someValue;
2019
}
2120

22-
@JsonAnySetter
23-
public void setSomeValue(JsonNode value) {
21+
public void setSomeValue(Map<String, Object> value) {
2422
this.someValue = value;
2523
}
2624

0 commit comments

Comments
 (0)