fix!: watch all namespaces by default if no namespaces are specified

Author: metacosm

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

@@ -28,11 +28,7 @@
 
   /**
    * Specified which namespaces this Controller monitors for custom resources events. If no
-   * namespace is specified then the controller will monitor the namespace it is deployed in (or the
-   * namespace to which the Kubernetes client is connected to). To specify that the controller needs
-   * to monitor all namespaces, add {@link
-   * io.javaoperatorsdk.operator.api.config.ControllerConfiguration#WATCH_ALL_NAMESPACES_MARKER} to
-   * this field.
+   * namespace is specified then the controller will monitor all namespaces by default.
    *
    * @return the list of namespaces this controller monitors
    */

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

@@ -31,7 +31,7 @@ public AbstractControllerConfiguration(
     this.generationAware = generationAware;
     this.namespaces =
         namespaces != null ? Collections.unmodifiableSet(namespaces) : Collections.emptySet();
-    this.watchAllNamespaces = this.namespaces.contains(WATCH_ALL_NAMESPACES_MARKER);
+    this.watchAllNamespaces = this.namespaces.isEmpty();
     this.retryConfiguration =
         retryConfiguration == null
             ? ControllerConfiguration.super.getRetryConfiguration()

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

@@ -25,7 +25,7 @@ default Set<String> getNamespaces() {
   }
 
   default boolean watchAllNamespaces() {
-    return getNamespaces().contains(WATCH_ALL_NAMESPACES_MARKER);
+    return getNamespaces().isEmpty();
   }
 
   default RetryConfiguration getRetryConfiguration() {

operator-framework-quarkus-extension/runtime/src/main/java/io/javaoperatorsdk/quarkus/extension/ExternalControllerConfiguration.java

@@ -1,6 +1,5 @@
 package io.javaoperatorsdk.quarkus.extension;
 
-import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
 import io.quarkus.runtime.annotations.ConfigGroup;
 import io.quarkus.runtime.annotations.ConfigItem;
 import java.util.List;
@@ -10,9 +9,8 @@
 public class ExternalControllerConfiguration {
 
   /**
-   * An optional list of comma-separated namespace names the controller should watch. If the list
-   * contains {@link ControllerConfiguration#WATCH_ALL_NAMESPACES_MARKER} then the controller will
-   * watch all namespaces.
+   * An optional list of comma-separated namespace names the controller should watch. If this
+   * property is left empty then the controller will watch all namespaces.
    */
   @ConfigItem public Optional<List<String>> namespaces;
 

samples/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/SchemaController.java

@@ -6,11 +6,9 @@
 import io.fabric8.kubernetes.api.model.SecretBuilder;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.javaoperatorsdk.operator.api.Context;
-import io.javaoperatorsdk.operator.api.Controller;
 import io.javaoperatorsdk.operator.api.DeleteControl;
 import io.javaoperatorsdk.operator.api.ResourceController;
 import io.javaoperatorsdk.operator.api.UpdateControl;
-import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
@@ -22,7 +20,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Controller(namespaces = ControllerConfiguration.WATCH_ALL_NAMESPACES_MARKER)
 public class SchemaController implements ResourceController<Schema> {
   static final String USERNAME_FORMAT = "%s-user";
   static final String SECRET_FORMAT = "%s-secret";

samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/TomcatController.java

@@ -10,11 +10,9 @@
 import io.fabric8.kubernetes.client.dsl.ServiceResource;
 import io.fabric8.kubernetes.client.utils.Serialization;
 import io.javaoperatorsdk.operator.api.Context;
-import io.javaoperatorsdk.operator.api.Controller;
 import io.javaoperatorsdk.operator.api.DeleteControl;
 import io.javaoperatorsdk.operator.api.ResourceController;
 import io.javaoperatorsdk.operator.api.UpdateControl;
-import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
 import io.javaoperatorsdk.operator.processing.event.EventSourceManager;
 import io.javaoperatorsdk.operator.processing.event.internal.CustomResourceEvent;
 import java.io.IOException;
@@ -25,7 +23,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Controller(namespaces = ControllerConfiguration.WATCH_ALL_NAMESPACES_MARKER)
 public class TomcatController implements ResourceController<Tomcat> {
 
   private final Logger log = LoggerFactory.getLogger(getClass());

samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/WebappController.java

@@ -3,8 +3,10 @@
 import io.fabric8.kubernetes.api.model.Pod;
 import io.fabric8.kubernetes.api.model.apps.Deployment;
 import io.fabric8.kubernetes.client.KubernetesClient;
-import io.javaoperatorsdk.operator.api.*;
-import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
+import io.javaoperatorsdk.operator.api.Context;
+import io.javaoperatorsdk.operator.api.DeleteControl;
+import io.javaoperatorsdk.operator.api.ResourceController;
+import io.javaoperatorsdk.operator.api.UpdateControl;
 import java.io.ByteArrayOutputStream;
 import java.util.List;
 import java.util.Objects;
@@ -13,7 +15,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Controller(namespaces = ControllerConfiguration.WATCH_ALL_NAMESPACES_MARKER)
 public class WebappController implements ResourceController<Webapp> {
 
   private KubernetesClient kubernetesClient;

samples/webserver/src/main/java/io/javaoperatorsdk/operator/sample/WebServerController.java

@@ -12,11 +12,9 @@
 import io.fabric8.kubernetes.client.dsl.ServiceResource;
 import io.fabric8.kubernetes.client.utils.Serialization;
 import io.javaoperatorsdk.operator.api.Context;
-import io.javaoperatorsdk.operator.api.Controller;
 import io.javaoperatorsdk.operator.api.DeleteControl;
 import io.javaoperatorsdk.operator.api.ResourceController;
 import io.javaoperatorsdk.operator.api.UpdateControl;
-import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashMap;
@@ -25,7 +23,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Controller(namespaces = ControllerConfiguration.WATCH_ALL_NAMESPACES_MARKER)
 public class WebServerController implements ResourceController<WebServer> {
 
   private final Logger log = LoggerFactory.getLogger(getClass());