remove retry from the API

Author: csviri

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

@@ -42,24 +42,16 @@ public Operator(KubernetesClient k8sClient) {
 
 
     public <R extends CustomResource> void registerControllerForAllNamespaces(ResourceController<R> controller) throws OperatorException {
-        registerController(controller, true, GenericRetry.defaultLimitedExponentialRetry());
+        registerController(controller, true);
     }
 
-    public <R extends CustomResource> void registerControllerForAllNamespaces(ResourceController<R> controller, Retry retry) throws OperatorException {
-        registerController(controller, true, retry);
-    }
-
-    public <R extends CustomResource> void registerController(ResourceController<R> controller, String... targetNamespaces) throws OperatorException {
-        registerController(controller, false, GenericRetry.defaultLimitedExponentialRetry(), targetNamespaces);
-    }
-
-    public <R extends CustomResource> void registerController(ResourceController<R> controller, Retry retry, String... targetNamespaces) throws OperatorException {
-        registerController(controller, false, retry, targetNamespaces);
+    public <R extends CustomResource> void registerController(ResourceController<R> controller,  String... targetNamespaces) throws OperatorException {
+        registerController(controller, false, targetNamespaces);
     }
 
     @SuppressWarnings("rawtypes")
     private <R extends CustomResource> void registerController(ResourceController<R> controller,
-                                                               boolean watchAllNamespaces, Retry retry, String... targetNamespaces) throws OperatorException {
+                                                               boolean watchAllNamespaces, String... targetNamespaces) throws OperatorException {
         Class<R> resClass = getCustomResourceClass(controller);
         CustomResourceDefinitionContext crd = getCustomResourceDefinitionForController(controller);
         KubernetesDeserializer.registerCustomKind(crd.getVersion(), crd.getKind(), resClass);
@@ -70,7 +62,7 @@ private <R extends CustomResource> void registerController(ResourceController<R>
 
 
         ResourceCache resourceCache = new ResourceCache();
-        EventScheduler eventScheduler = new EventScheduler(resourceCache, eventDispatcher, retry);
+        EventScheduler eventScheduler = new EventScheduler(resourceCache, eventDispatcher);
         DefaultEventSourceManager eventSourceManager = new DefaultEventSourceManager(eventScheduler);
         eventScheduler.setDefaultEventSourceManager(eventSourceManager);
 

operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/EventScheduler.java

@@ -50,7 +50,7 @@ public class EventScheduler implements EventHandler {
 
     private final ReentrantLock lock = new ReentrantLock();
 
-    public EventScheduler(ResourceCache resourceCache, EventDispatcher eventDispatcher, Retry retry) {
+    public EventScheduler(ResourceCache resourceCache, EventDispatcher eventDispatcher) {
         this.resourceCache = resourceCache;
         this.eventDispatcher = eventDispatcher;
         eventBuffer = new EventBuffer();
@@ -90,11 +90,8 @@ void eventProcessingFinished(ExecutionScope executionScope, PostExecutionControl
         try {
             lock.lock();
             unsetUnderExecution(executionScope.getCustomResourceUid());
-            // todo on retry error put back the events on the beginning of buffer list
-
             defaultEventSourceManager.controllerExecuted(
                     new ExecutionDescriptor(executionScope, postExecutionControl, LocalDateTime.now()));
-
             if (containsCustomResourceDeletedEvent(executionScope.getEvents())) {
                 cleanupAfterDeletedEvent(executionScope.getCustomResourceUid());
             } else {
@@ -111,7 +108,6 @@ private void cleanupAfterDeletedEvent(String customResourceUid) {
         resourceCache.cleanup(customResourceUid);
     }
 
-
     private boolean isControllerUnderExecution(String customResourceUid) {
         return underProcessing.contains(customResourceUid);
     }

operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/event/internal/DelayedEventSource.java

@@ -5,15 +5,8 @@
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
-/**
- *  This is a simplistic impl of the delayed event source.
- *  Possible improvements:
- *   - if an event is scheduled already for a CR cancel that and schedule the new one
- */
 public class DelayedEventSource extends AbstractEventSource {
-    public static final String DEFAULT_NAME = "DelayedReprocessEventSource";
 
-    // todo shared thread pool?
     private final ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(1);
 
     public void scheduleDelayedEvent(String resourceUid, long milliseconds) {
@@ -32,5 +25,4 @@ public void run() {
             eventHandler.handleEvent(new DelayedReprocessEvent(resourceId, DelayedEventSource.this));
         }
     }
-
 }

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

@@ -27,8 +27,7 @@ public CustomServiceController customServiceController(KubernetesClient client)
     @Bean
     public Operator operator(KubernetesClient client, List<ResourceController> controllers) {
         Operator operator = new Operator(client);
-        controllers.forEach(c -> operator.registerControllerForAllNamespaces(c,
-                GenericRetry.defaultLimitedExponentialRetry()));
+        controllers.forEach(c -> operator.registerControllerForAllNamespaces(c));
         return operator;
     }
 

spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/spingboot/starter/OperatorAutoConfiguration.java

@@ -42,9 +42,9 @@ public KubernetesClient kubernetesClient(OperatorProperties operatorProperties)
 
     @Bean
     @ConditionalOnMissingBean(Operator.class)
-    public Operator operator(KubernetesClient kubernetesClient, Retry retry, List<ResourceController> resourceControllers) {
+    public Operator operator(KubernetesClient kubernetesClient, List<ResourceController> resourceControllers) {
         Operator operator = new Operator(kubernetesClient);
-        resourceControllers.forEach(r -> operator.registerControllerForAllNamespaces(r, retry));
+        resourceControllers.forEach(r -> operator.registerControllerForAllNamespaces(r));
         return operator;
     }