From fa6bcb786611f257f0a85e7f55e8166551f1e67b Mon Sep 17 00:00:00 2001
From: csviri <csviri@gmail.com>
Date: Wed, 18 May 2022 11:50:22 +0200
Subject: [PATCH 1/2] fix: same as controller config for
 KubernetesDependentResource standalone mode

---
 .../KubernetesDependentResource.java          | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java
index 4196eb0e7e..35db3c8b38 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java
@@ -12,6 +12,7 @@
 import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
+import io.javaoperatorsdk.operator.api.reconciler.Constants;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.api.reconciler.EventSourceContext;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.managed.DependentResourceConfigurator;
@@ -35,6 +36,7 @@ public abstract class KubernetesDependentResource<R extends HasMetadata, P exten
   private final Matcher<R, P> matcher;
   private final ResourceUpdatePreProcessor<R> processor;
   private final Class<R> resourceType;
+  private KubernetesDependentResourceConfig kubernetesDependentResourceConfig;
 
   @SuppressWarnings("unchecked")
   public KubernetesDependentResource(Class<R> resourceType) {
@@ -49,12 +51,17 @@ public KubernetesDependentResource(Class<R> resourceType) {
 
   @Override
   public void configureWith(KubernetesDependentResourceConfig config) {
-    configureWith(config.labelSelector(), config.namespaces(), !config.wereNamespacesConfigured());
+    this.kubernetesDependentResourceConfig = config;
   }
 
   @SuppressWarnings("unchecked")
   private void configureWith(String labelSelector, Set<String> namespaces,
-      boolean inheritNamespacesOnChange) {
+      boolean inheritNamespacesOnChange, EventSourceContext<P> context) {
+
+    if (namespaces.equals(Constants.SAME_AS_CONTROLLER_NAMESPACES_SET)) {
+      namespaces = context.getControllerConfiguration().getNamespaces();
+    }
+
     final SecondaryToPrimaryMapper<R> primaryResourcesRetriever =
         (this instanceof SecondaryToPrimaryMapper) ? (SecondaryToPrimaryMapper<R>) this
             : Mappers.fromOwnerReference();
@@ -136,9 +143,18 @@ protected NonNamespaceOperation<R, KubernetesResourceList<R>, Resource<R>> prepa
 
   @Override
   protected InformerEventSource<R, P> createEventSource(EventSourceContext<P> context) {
-    configureWith(null, context.getControllerConfiguration().getNamespaces(), true);
-    log.warn("Using default configuration for " + resourceType().getSimpleName()
-        + " KubernetesDependentResource, call configureWith to provide configuration");
+    if (kubernetesDependentResourceConfig != null) {
+      configureWith(kubernetesDependentResourceConfig.labelSelector(),
+          kubernetesDependentResourceConfig.namespaces(),
+          !kubernetesDependentResourceConfig.wereNamespacesConfigured(), context);
+    } else {
+      configureWith(null, context.getControllerConfiguration().getNamespaces(),
+          true, context);
+      log.warn(
+          "Using default configuration for "
+              + resourceType().getSimpleName()
+              + " KubernetesDependentResource, call configureWith to provide configuration");
+    }
     return eventSource();
   }
 

From ef697f94b40da7fa20c775c8c75354517f8298cc Mon Sep 17 00:00:00 2001
From: csviri <csviri@gmail.com>
Date: Wed, 18 May 2022 12:09:31 +0200
Subject: [PATCH 2/2] smell fix

---
 .../dependent/kubernetes/KubernetesDependentResource.java    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java
index 35db3c8b38..10429185d3 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java
@@ -151,9 +151,8 @@ protected InformerEventSource<R, P> createEventSource(EventSourceContext<P> cont
       configureWith(null, context.getControllerConfiguration().getNamespaces(),
           true, context);
       log.warn(
-          "Using default configuration for "
-              + resourceType().getSimpleName()
-              + " KubernetesDependentResource, call configureWith to provide configuration");
+          "Using default configuration for {} KubernetesDependentResource, call configureWith to provide configuration",
+          resourceType().getSimpleName());
     }
     return eventSource();
   }