feat!: retrieve ConfigurationService from ControllerConfiguration

Author: metacosm

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/AbstractControllerConfiguration.java

@@ -15,6 +15,7 @@ public abstract class AbstractControllerConfiguration<R extends CustomResource>
   private final Set<String> namespaces;
   private final boolean watchAllNamespaces;
   private final RetryConfiguration retryConfiguration;
+  private ConfigurationService service;
 
   public AbstractControllerConfiguration(
       String associatedControllerClassName,
@@ -77,4 +78,14 @@ public boolean watchAllNamespaces() {
   public RetryConfiguration getRetryConfiguration() {
     return retryConfiguration;
   }
+
+  @Override
+  public ConfigurationService getConfigurationService() {
+    return service;
+  }
+
+  @Override
+  public void setConfigurationService(ConfigurationService service) {
+    this.service = service;
+  }
 }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ControllerConfiguration.java

@@ -26,7 +26,7 @@ default Set<String> getNamespaces() {
   default boolean watchAllNamespaces() {
     return allNamespacesWatched(getNamespaces());
   }
-  
+
   static boolean allNamespacesWatched(Set<String> namespaces) {
     return namespaces == null || namespaces.isEmpty();
   }
@@ -36,10 +36,16 @@ default boolean watchCurrentNamespace() {
   }
 
   static boolean currentNamespaceWatched(Set<String> namespaces) {
-    return namespaces != null && namespaces.size() == 1 && namespaces.contains(Controller.WATCH_CURRENT_NAMESPACE);
+    return namespaces != null
+        && namespaces.size() == 1
+        && namespaces.contains(Controller.WATCH_CURRENT_NAMESPACE);
   }
 
   default RetryConfiguration getRetryConfiguration() {
     return RetryConfiguration.DEFAULT;
   }
+
+  ConfigurationService getConfigurationService();
+
+  void setConfigurationService(ConfigurationService service);
 }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/internal/CustomResourceEventSource.java

@@ -9,12 +9,14 @@
 import io.fabric8.kubernetes.client.WatcherException;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.internal.CustomResourceOperationsImpl;
+import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
 import io.javaoperatorsdk.operator.processing.CustomResourceCache;
 import io.javaoperatorsdk.operator.processing.KubernetesResourceUtils;
 import io.javaoperatorsdk.operator.processing.event.AbstractEventSource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -71,14 +73,10 @@ private CustomResourceEventSource(
     this.resClass = resClass.getName();
   }
 
-  private boolean isWatchAllNamespaces() {
-    return targetNamespaces == null;
-  }
-
   @Override
   public void start() {
     CustomResourceOperationsImpl crClient = (CustomResourceOperationsImpl) client;
-    if (isWatchAllNamespaces()) {
+    if (ControllerConfiguration.allNamespacesWatched(Set.of(targetNamespaces))) {
       var w = crClient.inAnyNamespace().watch(this);
       watches.add(w);
       log.debug("Registered controller {} -> {} for any namespace", resClass, w);

operator-framework/src/main/java/io/javaoperatorsdk/operator/config/runtime/AnnotationConfiguration.java

@@ -4,6 +4,7 @@
 import io.javaoperatorsdk.operator.ControllerUtils;
 import io.javaoperatorsdk.operator.api.Controller;
 import io.javaoperatorsdk.operator.api.ResourceController;
+import io.javaoperatorsdk.operator.api.config.ConfigurationService;
 import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
 import java.util.Optional;
 import java.util.Set;
@@ -14,6 +15,7 @@ public class AnnotationConfiguration<R extends CustomResource>
 
   private final ResourceController<R> controller;
   private final Optional<Controller> annotation;
+  private ConfigurationService service;
 
   public AnnotationConfiguration(ResourceController<R> controller) {
     this.controller = controller;
@@ -53,6 +55,16 @@ public Set<String> getNamespaces() {
     return Set.of(annotation.map(Controller::namespaces).orElse(new String[] {}));
   }
 
+  @Override
+  public ConfigurationService getConfigurationService() {
+    return service;
+  }
+
+  @Override
+  public void setConfigurationService(ConfigurationService service) {
+    this.service = service;
+  }
+
   @Override
   public String getAssociatedControllerClassName() {
     return controller.getClass().getCanonicalName();