Skip to content

Commit c03cd5a

Browse files
committed
revert owner ref usage
1 parent 1c8fde0 commit c03cd5a

File tree

3 files changed

+1
-23
lines changed

3 files changed

+1
-23
lines changed

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

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
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;
2423

2524
public abstract class AbstractTestReconciler<P extends CustomResource<BoundedCacheTestSpec, BoundedCacheTestStatus>>
2625
implements KubernetesClientAware, Reconciler<P>,
@@ -64,15 +63,7 @@ protected void createConfigMap(P resource) {
6463
.build())
6564
.withData(Map.of(DATA_KEY, resource.getSpec().getData()))
6665
.build();
67-
68-
if (resource instanceof Namespaced) {
69-
cm.getMetadata()
70-
.setLabels(Map.of(Mappers.DEFAULT_ANNOTATION_FOR_NAME, resource.getMetadata().getName()));
71-
} else {
72-
cm.addOwnerReference(resource);
73-
}
74-
75-
66+
cm.addOwnerReference(resource);
7667
client.configMaps().resource(cm).create();
7768
}
7869

@@ -96,9 +87,6 @@ public Map<String, EventSource> prepareEventSources(
9687
1);
9788

9889
var es = new InformerEventSource<>(InformerConfiguration.from(ConfigMap.class, context)
99-
.withSecondaryToPrimaryMapper(
100-
Namespaced.class.isAssignableFrom(customResourceClass()) ? Mappers.fromOwnerReference()
101-
: Mappers.fromDefaultAnnotations())
10290
.withItemStore(boundedItemStore)
10391
.build(), context);
10492

@@ -111,6 +99,4 @@ private void ensureStatus(P resource) {
11199
}
112100
}
113101

114-
protected abstract Class<P> customResourceClass();
115-
116102
}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,4 @@
77
public class BoundedCacheClusterScopeTestReconciler extends
88
AbstractTestReconciler<BoundedCacheClusterScopeTestCustomResource> {
99

10-
@Override
11-
protected Class<BoundedCacheClusterScopeTestCustomResource> customResourceClass() {
12-
return BoundedCacheClusterScopeTestCustomResource.class;
13-
}
1410
}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,4 @@
77
public class BoundedCacheTestReconciler
88
extends AbstractTestReconciler<BoundedCacheTestCustomResource> {
99

10-
@Override
11-
protected Class<BoundedCacheTestCustomResource> customResourceClass() {
12-
return BoundedCacheTestCustomResource.class;
13-
}
1410
}

0 commit comments

Comments
 (0)