add improvements on spring boot support

Author: csviri

pom.xml

@@ -40,6 +40,7 @@
         <module>samples</module>
     </modules>
 
+
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -77,7 +78,7 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-core</artifactId>
-                <version>5.1.8.RELEASE</version>
+                <version>5.2.5.RELEASE</version>
                 <scope>compile</scope>
             </dependency>
         </dependencies>
@@ -95,7 +96,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <!--<version>2.19.1</version> -->
+                <version>2.22.2</version>
                 <configuration>
                     <includes>
                         <include>**/*IT.java</include>

samples/basic/spring-boot/src/main/java/com/github/containersolutions/operator/sample/SampleComponent.java

@@ -2,8 +2,6 @@
 
 import com.github.containersolutions.operator.Operator;
 import io.fabric8.kubernetes.client.KubernetesClient;
-import io.fabric8.kubernetes.client.dsl.internal.CustomResourceOperationsImpl;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 /**
@@ -18,17 +16,10 @@ public class SampleComponent {
 
     private final CustomServiceController customServiceController;
 
-    /**
-     * You can use qualifier for custom resource operation in case there are more custom resources for the operator
-     */
-    private final CustomResourceOperationsImpl customResourceOperations;
-
     public SampleComponent(Operator operator, KubernetesClient kubernetesClient,
-                           CustomServiceController customServiceController,
-                           @Qualifier(CustomServiceController.KIND) CustomResourceOperationsImpl customResourceOperations) {
+                           CustomServiceController customServiceController) {
         this.operator = operator;
         this.kubernetesClient = kubernetesClient;
         this.customServiceController = customServiceController;
-        this.customResourceOperations = customResourceOperations;
     }
 }

samples/basic/spring-boot/src/main/resources/application.yaml

@@ -0,0 +1,2 @@
+operator.controller.retry:
+  maxAttempts: 3

spring-boot-starter/pom.xml

@@ -40,13 +40,12 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>2.1.6.RELEASE</version>
+                <version>2.2.6.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
         </dependencies>
     </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

spring-boot-starter/src/main/java/com/github/containersolutions/operator/spingboot/starter/OperatorAutoConfiguration.java

@@ -2,10 +2,11 @@
 
 import com.github.containersolutions.operator.Operator;
 import com.github.containersolutions.operator.api.ResourceController;
+import com.github.containersolutions.operator.processing.retry.GenericRetry;
+import com.github.containersolutions.operator.processing.retry.Retry;
 import io.fabric8.kubernetes.client.ConfigBuilder;
 import io.fabric8.kubernetes.client.DefaultKubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClient;
-import io.fabric8.kubernetes.client.dsl.internal.CustomResourceOperationsImpl;
 import io.fabric8.openshift.client.DefaultOpenShiftClient;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -15,18 +16,17 @@
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.support.GenericApplicationContext;
 
 import java.util.List;
 
 @Configuration
-@EnableConfigurationProperties(OperatorProperties.class)
+@EnableConfigurationProperties({OperatorProperties.class, RetryProperties.class})
 @ConditionalOnMissingBean(Operator.class)
 public class OperatorAutoConfiguration {
     private static final Logger log = LoggerFactory.getLogger(OperatorAutoConfiguration.class);
 
     @Autowired
-    private GenericApplicationContext genericApplicationContext;
+    private RetryProperties retryProperties;
 
     @Autowired
     private OperatorProperties operatorProperties;
@@ -55,7 +55,28 @@ public KubernetesClient kubernetesClient() {
     @Bean
     public Operator operator(KubernetesClient kubernetesClient) {
         Operator operator = new Operator(kubernetesClient);
-        resourceControllers.forEach(r -> operator.registerController(r));
+        Retry retry = createRetryBasedOnProperties();
+        resourceControllers.forEach(r -> operator.registerControllerForAllNamespaces(r, retry));
         return operator;
     }
+
+    private Retry createRetryBasedOnProperties() {
+        GenericRetry retry = new GenericRetry();
+        if (retryProperties.getInitialInterval() != null) {
+            retry.setInitialInterval(retryProperties.getInitialInterval());
+        }
+        if (retryProperties.getIntervalMultiplier() != null) {
+            retry.setIntervalMultiplier(retryProperties.getIntervalMultiplier());
+        }
+        if (retryProperties.getMaxAttempts() != null) {
+            retry.setMaxAttempts(retryProperties.getMaxAttempts());
+        }
+        if (retryProperties.getMaxElapsedTime() != null) {
+            retry.setMaxElapsedTime(retryProperties.getMaxElapsedTime());
+        }
+        if (retryProperties.getMaxInterval() != null) {
+            retry.setInitialInterval(retryProperties.getMaxInterval());
+        }
+        return retry;
+    }
 }

spring-boot-starter/src/main/java/com/github/containersolutions/operator/spingboot/starter/OperatorProperties.java

@@ -2,7 +2,7 @@
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
-@ConfigurationProperties(prefix = "operator.kubernetes")
+@ConfigurationProperties(prefix = "operator.kubernetes.client")
 public class OperatorProperties {
 
     private boolean openshift = false;

spring-boot-starter/src/main/java/com/github/containersolutions/operator/spingboot/starter/RetryProperties.java

@@ -0,0 +1,58 @@
+package com.github.containersolutions.operator.spingboot.starter;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(prefix = "operator.controller.retry")
+public class RetryProperties {
+
+    private Integer maxAttempts;
+    private Long initialInterval;
+    private Double intervalMultiplier;
+    private Long maxInterval;
+    private Long maxElapsedTime;
+
+    public Integer getMaxAttempts() {
+        return maxAttempts;
+    }
+
+    public RetryProperties setMaxAttempts(Integer maxAttempts) {
+        this.maxAttempts = maxAttempts;
+        return this;
+    }
+
+    public Long getInitialInterval() {
+        return initialInterval;
+    }
+
+    public RetryProperties setInitialInterval(Long initialInterval) {
+        this.initialInterval = initialInterval;
+        return this;
+    }
+
+    public Double getIntervalMultiplier() {
+        return intervalMultiplier;
+    }
+
+    public RetryProperties setIntervalMultiplier(Double intervalMultiplier) {
+        this.intervalMultiplier = intervalMultiplier;
+        return this;
+    }
+
+    public Long getMaxInterval() {
+        return maxInterval;
+    }
+
+    public RetryProperties setMaxInterval(Long maxInterval) {
+        this.maxInterval = maxInterval;
+        return this;
+    }
+
+    public Long getMaxElapsedTime() {
+        return maxElapsedTime;
+    }
+
+    public RetryProperties setMaxElapsedTime(Long maxElapsedTime) {
+        this.maxElapsedTime = maxElapsedTime;
+        return this;
+    }
+}