wip

Signed-off-by: Attila Mészáros <a_meszaros@apple.com>

Author: csviri

sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/TomcatOperator.java

@@ -17,6 +17,7 @@
 
 import java.io.IOException;
 
+import io.javaoperatorsdk.operator.api.config.loader.ConfigLoader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.takes.facets.fork.FkRegex;
@@ -28,13 +29,13 @@
 
 public class TomcatOperator {
 
-  private static final Logger log = LoggerFactory.getLogger(TomcatOperator.class);
-
   public static void main(String[] args) throws IOException {
 
-    Operator operator = new Operator();
-    operator.register(new TomcatReconciler());
-    operator.register(new WebappReconciler(operator.getKubernetesClient()));
+    Operator operator = new Operator(ConfigLoader.DEFAULT.applyConfigs());
+    operator.register(new TomcatReconciler(),
+            ConfigLoader.DEFAULT.applyControllerConfigs(TomcatReconciler.TOMCAT_CONTROLLER_NAME));
+    operator.register(new WebappReconciler(operator.getKubernetesClient()),
+            ConfigLoader.DEFAULT.applyControllerConfigs(WebappReconciler.WEBAPP_CONTROLLER_NAME));
     operator.start();
 
     new FtBasic(new TkFork(new FkRegex("/health", "ALL GOOD.")), 8080).start(Exit.NEVER);

sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/TomcatReconciler.java

@@ -35,10 +35,11 @@
       @Dependent(type = DeploymentDependentResource.class),
       @Dependent(type = ServiceDependentResource.class)
     })
-@ControllerConfiguration
+@ControllerConfiguration(name = TomcatReconciler.TOMCAT_CONTROLLER_NAME)
 public class TomcatReconciler implements Reconciler<Tomcat> {
 
-  private final Logger log = LoggerFactory.getLogger(getClass());
+    public static final String TOMCAT_CONTROLLER_NAME = "tomcat";
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
   @Override
   public UpdateControl<Tomcat> reconcile(Tomcat tomcat, Context<Tomcat> context) {

sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/WebappReconciler.java

@@ -47,10 +47,11 @@
 import io.javaoperatorsdk.operator.processing.event.source.SecondaryToPrimaryMapper;
 import io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource;
 
-@ControllerConfiguration
+@ControllerConfiguration(name = WebappReconciler.WEBAPP_CONTROLLER_NAME)
 public class WebappReconciler implements Reconciler<Webapp>, Cleaner<Webapp> {
 
   private static final Logger log = LoggerFactory.getLogger(WebappReconciler.class);
+  public static final String WEBAPP_CONTROLLER_NAME = "webapp";
 
   private final KubernetesClient kubernetesClient;