Skip to content

Commit d6eda01

Browse files
committed
fix IT
1 parent 63c30ed commit d6eda01

File tree

4 files changed

+16
-5
lines changed

4 files changed

+16
-5
lines changed

caffein-bounded-cache-support/src/test/java/io/javaoperatorsdk/operator/processing/event/source/cache/CaffeinBoundedCacheClusterScopeIT.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ BoundedCacheClusterScopeTestCustomResource createTestResource(int index) {
3434
.build());
3535
res.setSpec(new BoundedCacheTestSpec());
3636
res.getSpec().setData(INITIAL_DATA_PREFIX + index);
37+
res.getSpec().setTargetNamespace(extension.getNamespace());
3738
return res;
3839
}
3940

caffein-bounded-cache-support/src/test/java/io/javaoperatorsdk/operator/processing/event/source/cache/CaffeinBoundedCacheNamespacedIT.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
import io.javaoperatorsdk.operator.processing.event.source.cache.sample.namespacescope.BoundedCacheTestReconciler;
1212
import io.javaoperatorsdk.operator.processing.event.source.cache.sample.namespacescope.BoundedCacheTestSpec;
1313

14-
import static io.javaoperatorsdk.operator.processing.event.source.cache.BoundedCacheTestBase.INITIAL_DATA_PREFIX;
15-
import static io.javaoperatorsdk.operator.processing.event.source.cache.BoundedCacheTestBase.RESOURCE_NAME_PREFIX;
16-
1714
class CaffeinBoundedCacheNamespacedIT extends BoundedCacheTestBase<BoundedCacheTestCustomResource> {
1815

1916
@RegisterExtension
@@ -33,6 +30,7 @@ BoundedCacheTestCustomResource createTestResource(int index) {
3330
.build());
3431
res.setSpec(new BoundedCacheTestSpec());
3532
res.getSpec().setData(INITIAL_DATA_PREFIX + index);
33+
res.getSpec().setTargetNamespace(extension.getNamespace());
3634
return res;
3735
}
3836

caffein-bounded-cache-support/src/test/java/io/javaoperatorsdk/operator/processing/event/source/cache/sample/AbstractTestReconciler.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import io.javaoperatorsdk.operator.processing.event.source.cache.sample.namespacescope.BoundedCacheTestSpec;
2121
import io.javaoperatorsdk.operator.processing.event.source.cache.sample.namespacescope.BoundedCacheTestStatus;
2222
import io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource;
23+
import io.javaoperatorsdk.operator.processing.event.source.informer.Mappers;
2324

2425
public abstract class AbstractTestReconciler<P extends CustomResource<BoundedCacheTestSpec, BoundedCacheTestStatus>>
2526
implements KubernetesClientAware, Reconciler<P>,
@@ -58,8 +59,7 @@ protected void createConfigMap(P resource) {
5859
var cm = new ConfigMapBuilder()
5960
.withMetadata(new ObjectMetaBuilder()
6061
.withName(resource.getMetadata().getName())
61-
.withNamespace(resource instanceof Namespaced ? resource.getMetadata().getNamespace()
62-
: DEFAULT_NAMESPACE)
62+
.withNamespace(resource.getSpec().getTargetNamespace())
6363
.build())
6464
.withData(Map.of(DATA_KEY, resource.getSpec().getData()))
6565
.build();
@@ -88,6 +88,8 @@ public Map<String, EventSource> prepareEventSources(
8888

8989
var es = new InformerEventSource<>(InformerConfiguration.from(ConfigMap.class, context)
9090
.withItemStore(boundedItemStore)
91+
.withSecondaryToPrimaryMapper(
92+
Mappers.fromOwnerReference(this instanceof BoundedCacheClusterScopeTestReconciler))
9193
.build(), context);
9294

9395
return EventSourceInitializer.nameEventSources(es);

caffein-bounded-cache-support/src/test/java/io/javaoperatorsdk/operator/processing/event/source/cache/sample/namespacescope/BoundedCacheTestSpec.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
public class BoundedCacheTestSpec {
44

55
private String data;
6+
private String targetNamespace;
67

78
public String getData() {
89
return data;
@@ -12,4 +13,13 @@ public BoundedCacheTestSpec setData(String data) {
1213
this.data = data;
1314
return this;
1415
}
16+
17+
public String getTargetNamespace() {
18+
return targetNamespace;
19+
}
20+
21+
public BoundedCacheTestSpec setTargetNamespace(String targetNamespace) {
22+
this.targetNamespace = targetNamespace;
23+
return this;
24+
}
1525
}

0 commit comments

Comments
 (0)