refactor: Allow creating an Operator without a KubernetesClient instance.

Author: iocanel

Diff for: README.md

@@ -135,8 +135,7 @@ controller.
 public class Runner {
 
   public static void main(String[] args) {
-    Operator operator = new Operator(new DefaultKubernetesClient(),
-        DefaultConfigurationService.instance());
+    Operator operator = new Operator(DefaultConfigurationService.instance());
     operator.register(new WebServerController());
   }
 }

Diff for: docs/documentation/use-samples.md

@@ -50,8 +50,7 @@ controller.
 public class Runner {
 
   public static void main(String[] args) {
-    Operator operator = new Operator(new DefaultKubernetesClient(),
-        DefaultConfigurationService.instance());
+    Operator operator = new Operator(DefaultConfigurationService.instance());
     operator.register(new WebServerController());
   }
 }

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

@@ -11,6 +11,7 @@
 import org.slf4j.LoggerFactory;
 
 import io.fabric8.kubernetes.client.CustomResource;
+import io.fabric8.kubernetes.client.DefaultKubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.Version;
 import io.javaoperatorsdk.operator.api.ResourceController;
@@ -22,12 +23,16 @@
 @SuppressWarnings("rawtypes")
 public class Operator implements AutoCloseable {
   private static final Logger log = LoggerFactory.getLogger(Operator.class);
-  private final KubernetesClient k8sClient;
+  private final KubernetesClient kubernetesClient;
   private final ConfigurationService configurationService;
   private final ControllerManager controllers = new ControllerManager();
 
-  public Operator(KubernetesClient k8sClient, ConfigurationService configurationService) {
-    this.k8sClient = k8sClient;
+  public Operator(ConfigurationService configurationService) {
+    this(new DefaultKubernetesClient(), configurationService);
+  }
+
+  public Operator(KubernetesClient kubernetesClient, ConfigurationService configurationService) {
+    this.kubernetesClient = kubernetesClient;
     this.configurationService = configurationService;
   }
 
@@ -37,7 +42,7 @@ public void installShutdownHook() {
   }
 
   public KubernetesClient getKubernetesClient() {
-    return k8sClient;
+    return kubernetesClient;
   }
 
   public ConfigurationService getConfigurationService() {
@@ -65,7 +70,7 @@ public void start() {
 
     log.info("Client version: {}", Version.clientVersion());
     try {
-      final var k8sVersion = k8sClient.getVersion();
+      final var k8sVersion = kubernetesClient.getVersion();
       if (k8sVersion != null) {
         log.info("Server version: {}.{}", k8sVersion.getMajor(), k8sVersion.getMinor());
       }
@@ -93,7 +98,7 @@ public void close() {
     controllers.close();
 
     ExecutorServiceManager.close();
-    k8sClient.close();
+    kubernetesClient.close();
   }
 
   /**
@@ -138,7 +143,7 @@ public <R extends CustomResource> void register(
         configuration = existing;
       }
       final var configuredController =
-          new ConfiguredController(controller, configuration, k8sClient);
+          new ConfiguredController(controller, configuration, kubernetesClient);
       controllers.add(configuredController);
 
       final var watchedNS =

Diff for: samples/common/src/main/java/io/javaoperatorsdk/operator/sample/CustomServiceController.java

@@ -8,6 +8,7 @@
 import io.fabric8.kubernetes.api.model.ServiceBuilder;
 import io.fabric8.kubernetes.api.model.ServicePort;
 import io.fabric8.kubernetes.api.model.ServiceSpec;
+import io.fabric8.kubernetes.client.DefaultKubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.javaoperatorsdk.operator.api.Context;
 import io.javaoperatorsdk.operator.api.Controller;
@@ -24,6 +25,10 @@ public class CustomServiceController implements ResourceController<CustomService
 
   private final KubernetesClient kubernetesClient;
 
+  public CustomServiceController() {
+    this(new DefaultKubernetesClient());
+  }
+
   public CustomServiceController(KubernetesClient kubernetesClient) {
     this.kubernetesClient = kubernetesClient;
   }

Diff for: samples/pure-java/src/main/java/io/javaoperatorsdk/operator/sample/PureJavaApplicationRunner.java

@@ -1,20 +1,17 @@
 package io.javaoperatorsdk.operator.sample;
 
-import io.fabric8.kubernetes.client.DefaultKubernetesClient;
-import io.fabric8.kubernetes.client.KubernetesClient;
 import io.javaoperatorsdk.operator.Operator;
 import io.javaoperatorsdk.operator.api.config.ConfigurationServiceOverrider;
 import io.javaoperatorsdk.operator.config.runtime.DefaultConfigurationService;
 
 public class PureJavaApplicationRunner {
 
   public static void main(String[] args) {
-    KubernetesClient client = new DefaultKubernetesClient();
-    Operator operator = new Operator(client,
-        ConfigurationServiceOverrider.override(DefaultConfigurationService.instance())
+    Operator operator =
+        new Operator(ConfigurationServiceOverrider.override(DefaultConfigurationService.instance())
             .withConcurrentReconciliationThreads(2)
             .build());
-    operator.register(new CustomServiceController(client));
+    operator.register(new CustomServiceController());
     operator.start();
   }
 }

Diff for: samples/spring-boot-plain/src/main/java/io/javaoperatorsdk/operator/sample/Config.java

@@ -5,8 +5,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import io.fabric8.kubernetes.client.DefaultKubernetesClient;
-import io.fabric8.kubernetes.client.KubernetesClient;
 import io.javaoperatorsdk.operator.Operator;
 import io.javaoperatorsdk.operator.api.ResourceController;
 import io.javaoperatorsdk.operator.config.runtime.DefaultConfigurationService;
@@ -15,19 +13,14 @@
 public class Config {
 
   @Bean
-  public KubernetesClient kubernetesClient() {
-    return new DefaultKubernetesClient();
-  }
-
-  @Bean
-  public CustomServiceController customServiceController(KubernetesClient client) {
-    return new CustomServiceController(client);
+  public CustomServiceController customServiceController() {
+    return new CustomServiceController();
   }
 
   // Register all controller beans
   @Bean(initMethod = "start", destroyMethod = "stop")
-  public Operator operator(KubernetesClient client, List<ResourceController> controllers) {
-    Operator operator = new Operator(client, DefaultConfigurationService.instance());
+  public Operator operator(List<ResourceController> controllers) {
+    Operator operator = new Operator(DefaultConfigurationService.instance());
     controllers.forEach(operator::register);
     return operator;
   }