From 366aa07b00e22f08b4e51e7638e31acde625a9b4 Mon Sep 17 00:00:00 2001
From: Chris Laprun <metacosm@users.noreply.github.com>
Date: Mon, 9 Jan 2023 17:46:33 +0100
Subject: [PATCH 1/3] chore: update version to 4.3.0-SNAPSHOT (#1709)

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 81cdade686..4ff23cefa8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,14 +46,14 @@
         <fabric8-client.version>6.4.1</fabric8-client.version>
         <slf4j.version>1.7.36</slf4j.version>
         <log4j.version>2.19.0</log4j.version>
-        <mokito.version>5.1.0</mokito.version>
+        <mokito.version>5.1.1</mokito.version>
         <commons-lang3.version>3.12.0</commons-lang3.version>
         <compile-testing.version>0.19</compile-testing.version>
         <javapoet.version>1.13.0</javapoet.version>
         <assertj.version>3.24.2</assertj.version>
         <awaitility.version>4.2.0</awaitility.version>
         <spring-boot.version>2.7.3</spring-boot.version>
-        <micrometer-core.version>1.10.3</micrometer-core.version>
+        <micrometer-core.version>1.10.4</micrometer-core.version>
 
         <fmt-maven-plugin.version>2.11</fmt-maven-plugin.version>
         <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
@@ -68,7 +68,7 @@
         <maven-deploy-plugin.version>3.0.0</maven-deploy-plugin.version>
         <maven-install-plugin.version>3.1.0</maven-install-plugin.version>
         <git-commit-id-maven-plugin.version>5.0.0</git-commit-id-maven-plugin.version>
-        <formatter-maven-plugin.version>2.21.0</formatter-maven-plugin.version>
+        <formatter-maven-plugin.version>2.22.0</formatter-maven-plugin.version>
         <directory-maven-plugin.version>1.0</directory-maven-plugin.version>
         <impsort-maven-plugin.version>1.8.0</impsort-maven-plugin.version>
         <okhttp.version>4.10.0</okhttp.version>

From dedc5890e7096c59afab487c4643d5b8635e9864 Mon Sep 17 00:00:00 2001
From: Chris Laprun <metacosm@gmail.com>
Date: Wed, 25 Jan 2023 11:46:24 +0100
Subject: [PATCH 2/3] fix: do not change namespaces if they were manually set

---
 .../kubernetes/KubernetesDependentResourceConfig.java     | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

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..81f1bc0fc1 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
@@ -91,14 +91,12 @@ public ResourceDiscriminator getResourceDiscriminator() {
 
   @Override
   public void changeNamespaces(Set<String> namespaces) {
-    if (!wereNamespacesConfigured()) {
-      this.namespacesWereConfigured = true;
-      setNamespaces(namespaces);
-    }
+    setNamespaces(namespaces);
+    this.namespacesWereConfigured = true;
   }
 
   protected void setNamespaces(Set<String> namespaces) {
-    if (namespaces != null && !namespaces.isEmpty()) {
+    if (!wereNamespacesConfigured() && namespaces != null && !namespaces.isEmpty()) {
       this.namespaces = namespaces;
     }
   }

From 552050aa629c2860fe2322ff93dd0a8ff55d007f Mon Sep 17 00:00:00 2001
From: Chris Laprun <metacosm@gmail.com>
Date: Wed, 22 Feb 2023 16:59:36 +0100
Subject: [PATCH 3/3] refactor: remove unneeded implementation of
 NamespaceChangeable

---
 .../kubernetes/KubernetesDependentResourceConfig.java  | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

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 81f1bc0fc1..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<R> implements NamespaceChangeable {
+public class KubernetesDependentResourceConfig<R> {
 
   private Set<String> namespaces = Constants.SAME_AS_CONTROLLER_NAMESPACES_SET;
   private String labelSelector = NO_VALUE_SET;
@@ -89,12 +88,7 @@ public ResourceDiscriminator getResourceDiscriminator() {
     return resourceDiscriminator;
   }
 
-  @Override
-  public void changeNamespaces(Set<String> namespaces) {
-    setNamespaces(namespaces);
-    this.namespacesWereConfigured = true;
-  }
-
+  @SuppressWarnings("unused")
   protected void setNamespaces(Set<String> namespaces) {
     if (!wereNamespacesConfigured() && namespaces != null && !namespaces.isEmpty()) {
       this.namespaces = namespaces;