fix: remove setClient method on ResourceController

Author: metacosm

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

@@ -75,7 +75,6 @@ public <R extends CustomResource> void registerController(ResourceController<R>
 
     @SuppressWarnings("rawtypes")
     public <R extends CustomResource> void registerController(ResourceController<R> controller, Retry retry) throws OperatorException {
-        controller.setClient(this.k8sClient);
         Class<R> resClass = ControllerUtils.getCustomResourceClass(controller);
         CustomResourceDefinitionContext crd = getCustomResourceDefinitionForController(controller);
         KubernetesDeserializer.registerCustomKind(crd.getVersion(), crd.getKind(), resClass);

operator-framework/src/main/java/io/javaoperatorsdk/operator/api/ResourceController.java

@@ -1,7 +1,6 @@
 package io.javaoperatorsdk.operator.api;
 
 import io.fabric8.kubernetes.client.CustomResource;
-import io.fabric8.kubernetes.client.KubernetesClient;
 
 public interface ResourceController<R extends CustomResource> {
 
@@ -28,6 +27,4 @@ public interface ResourceController<R extends CustomResource> {
      * <b>However we will always call an update if there is no finalizer on object and its not marked for deletion.</b>
      */
     UpdateControl<R> createOrUpdateResource(R resource, Context<R> context);
-    
-    void setClient(KubernetesClient client);
 }

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/TestCustomResourceController.java

@@ -38,7 +38,6 @@ public TestCustomResourceController(boolean updateStatus) {
         this.updateStatus = updateStatus;
     }
 
-    @Override
     public void setClient(KubernetesClient client) {
         this.kubernetesClient = client;
     }

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/subresource/SubResourceTestCustomResourceController.java

@@ -2,7 +2,6 @@
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.fabric8.kubernetes.client.KubernetesClient;
 import io.javaoperatorsdk.operator.TestExecutionInfoProvider;
 import io.javaoperatorsdk.operator.api.Context;
 import io.javaoperatorsdk.operator.api.Controller;
@@ -22,11 +21,6 @@ public class SubResourceTestCustomResourceController implements ResourceControll
     private static final Logger log = LoggerFactory.getLogger(SubResourceTestCustomResourceController.class);
     private AtomicInteger numberOfExecutions = new AtomicInteger(0);
 
-    @Override
-    public void setClient(KubernetesClient client) {
-        // do nothing
-    }
-    
     @Override
     public boolean deleteResource(SubResourceTestCustomResource resource, Context<SubResourceTestCustomResource> context) {
         return true;

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

@@ -16,22 +16,23 @@
  * A very simple sample controller that creates a service with a label.
  */
 @Controller(customResourceClass = CustomService.class,
-        crdName = "customservices.sample.javaoperatorsdk")
+    crdName = "customservices.sample.javaoperatorsdk")
 public class CustomServiceController implements ResourceController<CustomService> {
-
+    
     public static final String KIND = "CustomService";
     private final static Logger log = LoggerFactory.getLogger(CustomServiceController.class);
 
-    private KubernetesClient kubernetesClient;
+    private final KubernetesClient kubernetesClient;
 
-    public CustomServiceController() {
+    public CustomServiceController(KubernetesClient kubernetesClient) {
+        this.kubernetesClient = kubernetesClient;
     }
-
+    
     @Override
     public boolean deleteResource(CustomService resource, Context<CustomService> context) {
         log.info("Execution deleteResource for: {}", resource.getMetadata().getName());
         kubernetesClient.services().inNamespace(resource.getMetadata().getNamespace())
-                .withName(resource.getSpec().getName()).delete();
+            .withName(resource.getSpec().getName()).delete();
         return true;
     }
 
@@ -53,9 +54,4 @@ public UpdateControl<CustomService> createOrUpdateResource(CustomService resourc
             .done();
         return UpdateControl.updateCustomResource(resource);
     }
-    
-    @Override
-    public void setClient(KubernetesClient client) {
-        this.kubernetesClient = client;
-    }
 }

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

@@ -18,7 +18,7 @@ public static void main(String[] args) throws IOException {
         log.info("MySQL Schema Operator starting");
 
         Operator operator = new Operator();
-        operator.registerController(new SchemaController());
+        operator.registerController(new SchemaController(operator.getClient()));
 
         new FtBasic(
             new TkFork(new FkRegex("/health", "ALL GOOD!")), 8080

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

@@ -30,10 +30,10 @@ public class SchemaController implements ResourceController<Schema> {
 
     private final Logger log = LoggerFactory.getLogger(getClass());
 
-    private KubernetesClient kubernetesClient;
+    private final KubernetesClient kubernetesClient;
 
-    public SchemaController() {
-        
+    public SchemaController(KubernetesClient kubernetesClient) {
+        this.kubernetesClient = kubernetesClient;
     }
 
     @Override
@@ -97,11 +97,6 @@ public UpdateControl<Schema> createOrUpdateResource(Schema schema, Context<Schem
         }
     }
 
-    @Override
-    public void setClient(KubernetesClient client) {
-        this.kubernetesClient = client;
-    }
-    
     @Override
     public boolean deleteResource(Schema schema, Context<Schema> context) {
         log.info("Execution deleteResource for: {}", schema.getMetadata().getName());

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

@@ -6,6 +6,6 @@ public class PureJavaApplicationRunner {
 
     public static void main(String[] args) {
         Operator operator = new Operator();
-        operator.registerController(new CustomServiceController());
+        operator.registerController(new CustomServiceController(operator.getClient()));
     }
 }

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

@@ -20,7 +20,7 @@ public KubernetesClient kubernetesClient() {
 
     @Bean
     public CustomServiceController customServiceController(KubernetesClient client) {
-        return new CustomServiceController();
+        return new CustomServiceController(client);
     }
 
     //  Register all controller beans

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

@@ -36,14 +36,14 @@ public class TomcatController implements ResourceController<Tomcat> {
 
     private final Logger log = LoggerFactory.getLogger(getClass());
 
-    private KubernetesClient kubernetesClient;
+    private final KubernetesClient kubernetesClient;
 
     private MixedOperation<Tomcat, CustomResourceList<Tomcat>, CustomResourceDoneable<Tomcat>, Resource<Tomcat, CustomResourceDoneable<Tomcat>>> tomcatOperations;
 
     private final List<Object> watchedResources = new ArrayList<>();
 
-    public TomcatController() {
-        
+    public TomcatController(KubernetesClient client) {
+        this.kubernetesClient = client;
     }
 
     private void updateTomcatStatus(Context<Tomcat> context, Tomcat tomcat, Deployment deployment) {
@@ -89,11 +89,6 @@ public void onClose(KubernetesClientException cause) {
         return UpdateControl.noUpdate();
     }
 
-    @Override
-    public void setClient(KubernetesClient client) {
-        this.kubernetesClient = client;
-    }
-    
     @Override
     public boolean deleteResource(Tomcat tomcat, Context<Tomcat> context) {
         deleteDeployment(tomcat);

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

@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 
+import io.fabric8.kubernetes.client.KubernetesClient;
 import io.javaoperatorsdk.operator.Operator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -17,11 +18,12 @@ public class TomcatOperator {
     public static void main(String[] args) throws IOException {
         Operator operator = new Operator();
 
-        TomcatController tomcatController = new TomcatController();
+        final KubernetesClient client = operator.getClient();
+        TomcatController tomcatController = new TomcatController(client);
         operator.registerController(tomcatController);
         tomcatController.setTomcatOperations(operator.getCustomResourceClients(Tomcat.class));
 
-        operator.registerController(new WebappController());
+        operator.registerController(new WebappController(client));
 
 
         new FtBasic(

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

@@ -17,22 +17,23 @@
 import org.slf4j.LoggerFactory;
 
 @Controller(customResourceClass = Webapp.class,
-        crdName = "webapps.tomcatoperator.io")
+    crdName = "webapps.tomcatoperator.io")
 public class WebappController implements ResourceController<Webapp> {
-
-    private KubernetesClient kubernetesClient;
-
+    
+    private final KubernetesClient kubernetesClient;
+    
     private final Logger log = LoggerFactory.getLogger(getClass());
 
-    public WebappController() {
+    public WebappController(KubernetesClient client) {
+        this.kubernetesClient = client;
     }
-
+    
     @Override
     public UpdateControl createOrUpdateResource(Webapp webapp, Context<Webapp> context) {
         if (Objects.equals(webapp.getSpec().getUrl(), webapp.getStatus().getDeployedArtifact())) {
             return UpdateControl.noUpdate();
         }
-    
+        
         String fileName = fileNameFromWebapp(webapp);
         String[] command = new String[]{"wget", "-O", "/data/" + fileName, webapp.getSpec().getUrl()};
 
@@ -42,11 +43,6 @@ public UpdateControl createOrUpdateResource(Webapp webapp, Context<Webapp> conte
         return UpdateControl.updateStatusSubResource(webapp);
     }
 
-    @Override
-    public void setClient(KubernetesClient client) {
-        this.kubernetesClient = client;
-    }
-    
     @Override
     public boolean deleteResource(Webapp webapp, Context<Webapp> context) {
         String fileName = fileNameFromWebapp(webapp);

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

@@ -28,22 +28,23 @@
 import org.slf4j.LoggerFactory;
 
 @Controller(customResourceClass = WebServer.class,
-        crdName = "webservers.sample.javaoperatorsdk")
+    crdName = "webservers.sample.javaoperatorsdk")
 public class WebServerController implements ResourceController<WebServer> {
-
+    
     private final Logger log = LoggerFactory.getLogger(getClass());
 
-    private KubernetesClient kubernetesClient;
+    private final KubernetesClient kubernetesClient;
 
-    public WebServerController() {
+    public WebServerController(KubernetesClient client) {
+        this.kubernetesClient = client;
     }
-
+    
     @Override
     public UpdateControl<WebServer> createOrUpdateResource(WebServer webServer, Context<WebServer> context) {
         if (webServer.getSpec().getHtml().contains("error")) {
             throw new ErrorSimulationException("Simulating error");
         }
-
+        
         String ns = webServer.getMetadata().getNamespace();
 
         Map<String, String> data = new HashMap<>();
@@ -99,11 +100,6 @@ public UpdateControl<WebServer> createOrUpdateResource(WebServer webServer, Cont
         return UpdateControl.updateCustomResource(webServer);
     }
 
-    @Override
-    public void setClient(KubernetesClient client) {
-        this.kubernetesClient = client;
-    }
-    
     @Override
     public boolean deleteResource(WebServer nginx, Context<WebServer> context) {
         log.info("Execution deleteResource for: {}", nginx.getMetadata().getName());

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

@@ -18,7 +18,7 @@ public static void main(String[] args) throws IOException {
         log.info("WebServer Operator starting!");
 
         Operator operator = new Operator();
-        operator.registerController(new WebServerController());
+        operator.registerController(new WebServerController(operator.getClient()));
 
         new FtBasic(
             new TkFork(new FkRegex("/health", "ALL GOOD!")), 8080

spring-boot-starter/src/test/java/io/javaoperatorsdk/operator/springboot/starter/TestController.java

@@ -22,8 +22,4 @@ public boolean deleteResource(CustomResource resource, Context context) {
     public UpdateControl createOrUpdateResource(CustomResource resource, Context context) {
         return UpdateControl.noUpdate();
     }
-    
-    @Override
-    public void setClient(KubernetesClient client) {
-    }
 }