diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResourceConfig.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResourceConfig.java index 44a3b0a7bd..4047b25a13 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResourceConfig.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResourceConfig.java @@ -2,7 +2,6 @@ import java.util.Set; -import io.javaoperatorsdk.operator.api.config.NamespaceChangeable; import io.javaoperatorsdk.operator.api.reconciler.Constants; import io.javaoperatorsdk.operator.api.reconciler.ResourceDiscriminator; import io.javaoperatorsdk.operator.processing.event.source.filter.GenericFilter; @@ -12,7 +11,7 @@ import static io.javaoperatorsdk.operator.api.reconciler.Constants.NO_VALUE_SET; -public class KubernetesDependentResourceConfig implements NamespaceChangeable { +public class KubernetesDependentResourceConfig { private Set namespaces = Constants.SAME_AS_CONTROLLER_NAMESPACES_SET; private String labelSelector = NO_VALUE_SET; @@ -89,16 +88,9 @@ public ResourceDiscriminator getResourceDiscriminator() { return resourceDiscriminator; } - @Override - public void changeNamespaces(Set namespaces) { - if (!wereNamespacesConfigured()) { - this.namespacesWereConfigured = true; - setNamespaces(namespaces); - } - } - + @SuppressWarnings("unused") protected void setNamespaces(Set namespaces) { - if (namespaces != null && !namespaces.isEmpty()) { + if (!wereNamespacesConfigured() && namespaces != null && !namespaces.isEmpty()) { this.namespaces = namespaces; } } diff --git a/pom.xml b/pom.xml index 81cdade686..4ff23cefa8 100644 --- a/pom.xml +++ b/pom.xml @@ -46,14 +46,14 @@ 6.4.1 1.7.36 2.19.0 - 5.1.0 + 5.1.1 3.12.0 0.19 1.13.0 3.24.2 4.2.0 2.7.3 - 1.10.3 + 1.10.4 2.11 3.10.1 @@ -68,7 +68,7 @@ 3.0.0 3.1.0 5.0.0 - 2.21.0 + 2.22.0 1.0 1.8.0 4.10.0