Skip to content

Commit 850602a

Browse files
authored
fix: don't require namespace in KubernetesDependentResource.prepare() (#1683)
* fix: don't require namespace in KubernetesDependentResource.prepare() * fix: format with mvn clean install
1 parent e73c98e commit 850602a

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

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

Lines changed: 8 additions & 1 deletion
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.KubernetesClient;
1213
import io.fabric8.kubernetes.client.dsl.Resource;
1314
import io.javaoperatorsdk.operator.OperatorException;
@@ -163,12 +164,18 @@ protected Resource<R> prepare(R desired, P primary, String actionName) {
163164
actionName,
164165
desired.getClass(),
165166
ResourceID.fromResource(desired));
167+
166168
if (addOwnerReference()) {
167169
desired.addOwnerReference(primary);
168170
} else if (useDefaultAnnotationsToIdentifyPrimary()) {
169171
addDefaultSecondaryToPrimaryMapperAnnotations(desired, primary);
170172
}
171-
return client.resource(desired).inNamespace(desired.getMetadata().getNamespace());
173+
174+
if (desired instanceof Namespaced) {
175+
return client.resource(desired).inNamespace(desired.getMetadata().getNamespace());
176+
} else {
177+
return client.resource(desired);
178+
}
172179
}
173180

174181
@Override

0 commit comments

Comments
 (0)