wip

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

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/loader/ConfigLoader.java

@@ -17,11 +17,13 @@
 
 import java.time.Duration;
 import java.util.List;
+import java.util.Optional;
 import java.util.function.Consumer;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.api.config.ConfigurationServiceOverrider;
 import io.javaoperatorsdk.operator.api.config.ControllerConfigurationOverrider;
+import io.javaoperatorsdk.operator.processing.retry.GenericRetry;
 
 public class ConfigLoader {
 
@@ -87,6 +89,14 @@ public class ConfigLoader {
               Boolean.class,
               ConfigurationServiceOverrider::withCloneSecondaryResourcesWhenGettingFromCache));
 
+  // ---------------------------------------------------------------------------
+  // Controller-level retry property suffixes
+  // ---------------------------------------------------------------------------
+  static final String RETRY_MAX_ATTEMPTS_SUFFIX = "retry.max-attempts";
+  static final String RETRY_INITIAL_INTERVAL_SUFFIX = "retry.initial-interval";
+  static final String RETRY_INTERVAL_MULTIPLIER_SUFFIX = "retry.interval-multiplier";
+  static final String RETRY_MAX_INTERVAL_SUFFIX = "retry.max-interval";
+
   // ---------------------------------------------------------------------------
   // Controller-level (ControllerConfigurationOverrider) bindings
   // The key used at runtime is built as:
@@ -163,7 +173,47 @@ Consumer<ControllerConfigurationOverrider<R>> applyControllerConfigs(String cont
     // ControllerConfigurationOverrider<R>.
     List<ConfigBinding<ControllerConfigurationOverrider<R>, ?>> bindings =
         (List<ConfigBinding<ControllerConfigurationOverrider<R>, ?>>) (List<?>) CONTROLLER_BINDINGS;
-    return buildConsumer(bindings, prefix);
+    Consumer<ControllerConfigurationOverrider<R>> consumer = buildConsumer(bindings, prefix);
+
+    Consumer<ControllerConfigurationOverrider<R>> retryStep = buildRetryConsumer(prefix);
+    if (retryStep != null) {
+      consumer = consumer == null ? retryStep : consumer.andThen(retryStep);
+    }
+
+    return consumer;
+  }
+
+  /**
+   * If at least one retry property is present for the given prefix, returns a {@link Consumer} that
+   * builds a {@link GenericRetry} starting from {@link GenericRetry#defaultLimitedExponentialRetry}
+   * and overrides only the properties that are explicitly set.
+   */
+  private <R extends HasMetadata> Consumer<ControllerConfigurationOverrider<R>> buildRetryConsumer(
+      String prefix) {
+    Optional<Integer> maxAttempts =
+        configProvider.getValue(prefix + RETRY_MAX_ATTEMPTS_SUFFIX, Integer.class);
+    Optional<Long> initialInterval =
+        configProvider.getValue(prefix + RETRY_INITIAL_INTERVAL_SUFFIX, Long.class);
+    Optional<Double> intervalMultiplier =
+        configProvider.getValue(prefix + RETRY_INTERVAL_MULTIPLIER_SUFFIX, Double.class);
+    Optional<Long> maxInterval =
+        configProvider.getValue(prefix + RETRY_MAX_INTERVAL_SUFFIX, Long.class);
+
+    if (maxAttempts.isEmpty()
+        && initialInterval.isEmpty()
+        && intervalMultiplier.isEmpty()
+        && maxInterval.isEmpty()) {
+      return null;
+    }
+
+    return overrider -> {
+      GenericRetry retry = GenericRetry.defaultLimitedExponentialRetry();
+      maxAttempts.ifPresent(retry::setMaxAttempts);
+      initialInterval.ifPresent(retry::setInitialInterval);
+      intervalMultiplier.ifPresent(retry::setIntervalMultiplier);
+      maxInterval.ifPresent(retry::setMaxInterval);
+      overrider.withRetry(retry);
+    };
   }
 
   /**

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/loader/DefaultConfigProvider.java

@@ -65,6 +65,8 @@ private Object convert(String raw, Class<?> type) {
       return Integer.parseInt(raw);
     } else if (type == Long.class) {
       return Long.parseLong(raw);
+    } else if (type == Double.class) {
+      return Double.parseDouble(raw);
     } else if (type == Duration.class) {
       return Duration.parse(raw);
     }

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/loader/DefaultConfigProviderTest.java

@@ -16,6 +16,7 @@
 package io.javaoperatorsdk.operator.api.config.loader;
 
 import java.time.Duration;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.jupiter.api.Test;
 
@@ -35,14 +36,16 @@ void returnsEmptyWhenNeitherEnvNorPropertyIsSet() {
 
   @Test
   void readsStringFromEnvVariable() {
-    var envProvider = new DefaultConfigProvider(k -> k.equals("JOSDK_TEST_STRING") ? "from-env" : null);
+    var envProvider =
+        new DefaultConfigProvider(k -> k.equals("JOSDK_TEST_STRING") ? "from-env" : null);
     assertThat(envProvider.getValue("josdk.test.string", String.class)).hasValue("from-env");
   }
 
   @Test
   void envVariableKeyUsesUppercaseWithUnderscores() {
     // dots and hyphens both become underscores, key is uppercased
-    var envProvider = new DefaultConfigProvider(k -> k.equals("JOSDK_CACHE_SYNC_TIMEOUT") ? "PT10S" : null);
+    var envProvider =
+        new DefaultConfigProvider(k -> k.equals("JOSDK_CACHE_SYNC_TIMEOUT") ? "PT10S" : null);
     assertThat(envProvider.getValue("josdk.cache-sync.timeout", Duration.class))
         .hasValue(Duration.ofSeconds(10));
   }
@@ -51,7 +54,8 @@ void envVariableKeyUsesUppercaseWithUnderscores() {
   void envVariableTakesPrecedenceOverSystemProperty() {
     System.setProperty("josdk.test.precedence", "from-sysprop");
     try {
-      var envProvider = new DefaultConfigProvider(k -> k.equals("JOSDK_TEST_PRECEDENCE") ? "from-env" : null);
+      var envProvider =
+          new DefaultConfigProvider(k -> k.equals("JOSDK_TEST_PRECEDENCE") ? "from-env" : null);
       assertThat(envProvider.getValue("josdk.test.precedence", String.class)).hasValue("from-env");
     } finally {
       System.clearProperty("josdk.test.precedence");
@@ -63,7 +67,8 @@ void fallsBackToSystemPropertyWhenEnvVariableAbsent() {
     System.setProperty("josdk.test.fallback", "from-sysprop");
     try {
       var envProvider = new DefaultConfigProvider(k -> null);
-      assertThat(envProvider.getValue("josdk.test.fallback", String.class)).hasValue("from-sysprop");
+      assertThat(envProvider.getValue("josdk.test.fallback", String.class))
+          .hasValue("from-sysprop");
     } finally {
       System.clearProperty("josdk.test.fallback");
     }
@@ -125,7 +130,7 @@ void throwsForUnsupportedType() {
     System.setProperty("josdk.test.unsupported", "value");
     try {
       assertThatIllegalArgumentException()
-          .isThrownBy(() -> provider.getValue("josdk.test.unsupported", Double.class))
+          .isThrownBy(() -> provider.getValue("josdk.test.unsupported", AtomicInteger.class))
           .withMessageContaining("Unsupported config type");
     } finally {
       System.clearProperty("josdk.test.unsupported");