Skip to content

Commit 2509843

Browse files
committed
feat: handle clustered resource on secondary to primary mapper init
Fixes #2311 Signed-off-by: Chris Laprun <[email protected]>
1 parent 43b8591 commit 2509843

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

Diff for: operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import org.slf4j.LoggerFactory;
99

1010
import io.fabric8.kubernetes.api.model.HasMetadata;
11+
import io.fabric8.kubernetes.api.model.Namespaced;
1112
import io.fabric8.kubernetes.client.dsl.Resource;
1213
import io.javaoperatorsdk.operator.OperatorException;
1314
import io.javaoperatorsdk.operator.ReconcilerUtils;
@@ -37,6 +38,7 @@ public abstract class KubernetesDependentResource<R extends HasMetadata, P exten
3738
private static final Logger log = LoggerFactory.getLogger(KubernetesDependentResource.class);
3839
private final ResourceUpdaterMatcher<R> updaterMatcher;
3940
private final boolean garbageCollected = this instanceof GarbageCollected;
41+
private final boolean clustered;
4042
private KubernetesDependentResourceConfig<R> kubernetesDependentResourceConfig;
4143

4244
private final boolean usingCustomResourceUpdateMatcher;
@@ -49,6 +51,7 @@ public KubernetesDependentResource(Class<R> resourceType) {
4951
updaterMatcher = usingCustomResourceUpdateMatcher
5052
? (ResourceUpdaterMatcher<R>) this
5153
: GenericResourceUpdaterMatcher.updaterMatcherFor(resourceType);
54+
clustered = !Namespaced.class.isAssignableFrom(resourceType);
5255
}
5356

5457
@SuppressWarnings("unchecked")
@@ -87,7 +90,7 @@ private SecondaryToPrimaryMapper<R> getSecondaryToPrimaryMapper() {
8790
if (this instanceof SecondaryToPrimaryMapper) {
8891
return (SecondaryToPrimaryMapper<R>) this;
8992
} else if (garbageCollected) {
90-
return Mappers.fromOwnerReferences(false);
93+
return Mappers.fromOwnerReferences(clustered);
9194
} else if (useNonOwnerRefBasedSecondaryToPrimaryMapping()) {
9295
return Mappers.fromDefaultAnnotations();
9396
} else {

0 commit comments

Comments
 (0)