fix!: remove registerControllerForAllNamespaces to use controller config

The intent here is that controllers should be registered according to
their configuration. This will become even more relevant when
externalized configuration is in place (see #237). This also means
using ControllerConfiguration.WATCH_ALL_NAMESPACES_MARKER in the
namespaces field of the Controller annotation where appropriate since
that's what ControllerConfiguration uses to determine if a controller
should watch all namespaces. This still needs to be unified across the
code base (see #302).

Author: metacosm

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/Operator.java

@@ -44,17 +44,7 @@ public <R extends CustomResource> void register(ResourceController<R> controller
       registerController(controller, configuration.watchAllNamespaces(), retry, targetNamespaces);
     }
   }
-
-  public <R extends CustomResource> void registerControllerForAllNamespaces(
-      ResourceController<R> controller, Retry retry) throws OperatorException {
-    registerController(controller, true, retry);
-  }
-
-  public <R extends CustomResource> void registerControllerForAllNamespaces(
-      ResourceController<R> controller) throws OperatorException {
-    registerController(controller, true, null);
-  }
-
+  
   public <R extends CustomResource> void registerController(
       ResourceController<R> controller, Retry retry, String... targetNamespaces)
       throws OperatorException {

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

@@ -24,7 +24,7 @@ public static void main(String[] args) throws IOException {
     Config config = new ConfigBuilder().withNamespace(null).build();
     KubernetesClient client = new DefaultKubernetesClient(config);
     Operator operator = new Operator(client, DefaultConfigurationService.instance());
-    operator.registerControllerForAllNamespaces(new SchemaController(client));
+    operator.register(new SchemaController(client));
 
     new FtBasic(new TkFork(new FkRegex("/health", "ALL GOOD!")), 8080).start(Exit.NEVER);
   }

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

@@ -10,6 +10,7 @@
 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;
@@ -21,7 +22,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Controller
+@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/spring-boot-plain/src/main/java/io/javaoperatorsdk/operator/sample/Config.java

@@ -26,7 +26,7 @@ public CustomServiceController customServiceController(KubernetesClient client)
   @Bean
   public Operator operator(KubernetesClient client, List<ResourceController> controllers) {
     Operator operator = new Operator(client, DefaultConfigurationService.instance());
-    controllers.forEach(c -> operator.registerControllerForAllNamespaces(c));
+    controllers.forEach(operator::register);
     return operator;
   }
 }

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

@@ -10,9 +10,11 @@
 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;
@@ -23,6 +25,7 @@
 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/TomcatOperator.java

@@ -25,9 +25,9 @@ public static void main(String[] args) throws IOException {
     Operator operator = new Operator(client, DefaultConfigurationService.instance());
 
     TomcatController tomcatController = new TomcatController(client);
-    operator.registerControllerForAllNamespaces(tomcatController);
+    operator.register(tomcatController);
 
-    operator.registerControllerForAllNamespaces(new WebappController(client));
+    operator.register(new WebappController(client));
 
     new FtBasic(new TkFork(new FkRegex("/health", "ALL GOOD.")), 8080).start(Exit.NEVER);
   }

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

@@ -4,6 +4,7 @@
 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 java.io.ByteArrayOutputStream;
 import java.util.List;
 import java.util.Objects;
@@ -12,7 +13,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Controller
+@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,9 +12,11 @@
 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;
@@ -23,6 +25,7 @@
 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());

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

@@ -24,7 +24,7 @@ public static void main(String[] args) throws IOException {
     Config config = new ConfigBuilder().withNamespace(null).build();
     KubernetesClient client = new DefaultKubernetesClient(config);
     Operator operator = new Operator(client, DefaultConfigurationService.instance());
-    operator.registerControllerForAllNamespaces(new WebServerController(client));
+    operator.register(new WebServerController(client));
 
     new FtBasic(new TkFork(new FkRegex("/health", "ALL GOOD!")), 8080).start(Exit.NEVER);
   }