Skip to content

Commit 3de2284

Browse files
committed
fix: do not change namespaces if they were manually set (#1734)
Also remove unneeded implementation of NamespaceChangeable
1 parent dda5511 commit 3de2284

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

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

+3-11
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import java.util.Set;
44

5-
import io.javaoperatorsdk.operator.api.config.NamespaceChangeable;
65
import io.javaoperatorsdk.operator.api.reconciler.Constants;
76
import io.javaoperatorsdk.operator.api.reconciler.ResourceDiscriminator;
87
import io.javaoperatorsdk.operator.processing.event.source.filter.GenericFilter;
@@ -12,7 +11,7 @@
1211

1312
import static io.javaoperatorsdk.operator.api.reconciler.Constants.NO_VALUE_SET;
1413

15-
public class KubernetesDependentResourceConfig<R> implements NamespaceChangeable {
14+
public class KubernetesDependentResourceConfig<R> {
1615

1716
private Set<String> namespaces = Constants.SAME_AS_CONTROLLER_NAMESPACES_SET;
1817
private String labelSelector = NO_VALUE_SET;
@@ -89,16 +88,9 @@ public ResourceDiscriminator getResourceDiscriminator() {
8988
return resourceDiscriminator;
9089
}
9190

92-
@Override
93-
public void changeNamespaces(Set<String> namespaces) {
94-
if (!wereNamespacesConfigured()) {
95-
this.namespacesWereConfigured = true;
96-
setNamespaces(namespaces);
97-
}
98-
}
99-
91+
@SuppressWarnings("unused")
10092
protected void setNamespaces(Set<String> namespaces) {
101-
if (namespaces != null && !namespaces.isEmpty()) {
93+
if (!wereNamespacesConfigured() && namespaces != null && !namespaces.isEmpty()) {
10294
this.namespaces = namespaces;
10395
}
10496
}

0 commit comments

Comments
 (0)