Skip to content

Commit 0508a49

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 0508a49

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

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

+4-2
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,18 +38,19 @@ 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;
4345

44-
@SuppressWarnings("unchecked")
4546
public KubernetesDependentResource(Class<R> resourceType) {
4647
super(resourceType);
4748

4849
usingCustomResourceUpdateMatcher = this instanceof ResourceUpdaterMatcher;
4950
updaterMatcher = usingCustomResourceUpdateMatcher
5051
? (ResourceUpdaterMatcher<R>) this
5152
: GenericResourceUpdaterMatcher.updaterMatcherFor(resourceType);
53+
clustered = Namespaced.class.isAssignableFrom(resourceType);
5254
}
5355

5456
@SuppressWarnings("unchecked")
@@ -87,7 +89,7 @@ private SecondaryToPrimaryMapper<R> getSecondaryToPrimaryMapper() {
8789
if (this instanceof SecondaryToPrimaryMapper) {
8890
return (SecondaryToPrimaryMapper<R>) this;
8991
} else if (garbageCollected) {
90-
return Mappers.fromOwnerReferences(false);
92+
return Mappers.fromOwnerReferences(clustered);
9193
} else if (useNonOwnerRefBasedSecondaryToPrimaryMapping()) {
9294
return Mappers.fromDefaultAnnotations();
9395
} else {

0 commit comments

Comments
 (0)