Skip to content

Commit 475fb5b

Browse files
committed
fix: don't require namespace in KubernetesDependentResource.prepare()
1 parent 53a553e commit 475fb5b

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

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

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
package io.javaoperatorsdk.operator.processing.dependent.kubernetes;
22

3-
import java.util.HashMap;
4-
import java.util.Optional;
5-
import java.util.Set;
6-
7-
import org.slf4j.Logger;
8-
import org.slf4j.LoggerFactory;
9-
103
import io.fabric8.kubernetes.api.model.HasMetadata;
4+
import io.fabric8.kubernetes.api.model.Namespaced;
115
import io.fabric8.kubernetes.client.KubernetesClient;
126
import io.fabric8.kubernetes.client.dsl.Resource;
137
import io.javaoperatorsdk.operator.OperatorException;
@@ -27,6 +21,12 @@
2721
import io.javaoperatorsdk.operator.processing.event.source.SecondaryToPrimaryMapper;
2822
import io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource;
2923
import io.javaoperatorsdk.operator.processing.event.source.informer.Mappers;
24+
import org.slf4j.Logger;
25+
import org.slf4j.LoggerFactory;
26+
27+
import java.util.HashMap;
28+
import java.util.Optional;
29+
import java.util.Set;
3030

3131
@Ignore
3232
@Configured(by = KubernetesDependent.class, with = KubernetesDependentResourceConfig.class,
@@ -168,7 +168,11 @@ protected Resource<R> prepare(R desired, P primary, String actionName) {
168168
} else if (useDefaultAnnotationsToIdentifyPrimary()) {
169169
addDefaultSecondaryToPrimaryMapperAnnotations(desired, primary);
170170
}
171-
return client.resource(desired).inNamespace(desired.getMetadata().getNamespace());
171+
if (desired instanceof Namespaced) {
172+
return client.resource(desired).inNamespace(desired.getMetadata().getNamespace());
173+
} else {
174+
return client.resource(desired);
175+
}
172176
}
173177

174178
@Override

0 commit comments

Comments
 (0)