Skip to content

Commit e49e36b

Browse files
committed
test fix
1 parent c6cdbd8 commit e49e36b

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/RateLimiter.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@
66
import java.lang.annotation.Target;
77
import java.util.concurrent.TimeUnit;
88

9+
import io.javaoperatorsdk.operator.processing.event.rate.PeriodRateLimiter;
10+
911
@Retention(RetentionPolicy.RUNTIME)
1012
@Target({ElementType.TYPE})
1113
public @interface RateLimiter {
1214

13-
int limitForPeriod();
15+
int limitForPeriod() default PeriodRateLimiter.NO_LIMIT_PERIOD;
1416

15-
int refreshPeriod();
17+
int refreshPeriod() default PeriodRateLimiter.DEFAULT_REFRESH_PERIOD_SECONDS;
1618

1719
/**
1820
* @return time unit for max delay between reconciliations

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/rate/PeriodRateLimiter.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@
1313
*/
1414
public class PeriodRateLimiter implements RateLimiter {
1515

16-
public static final Duration DEFAULT_REFRESH_PERIOD = Duration.ofSeconds(2);
16+
public static final int DEFAULT_REFRESH_PERIOD_SECONDS = 2;
17+
public static final Duration DEFAULT_REFRESH_PERIOD =
18+
Duration.ofSeconds(DEFAULT_REFRESH_PERIOD_SECONDS);
19+
1720
public static final int DEFAULT_LIMIT_FOR_PERIOD = 3;
1821
/** To turn off rate limiting set limit fod period to a non-positive number */
1922
public static final int NO_LIMIT_PERIOD = -1;

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/CustomResourceSelectorTest.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@
2020
import io.javaoperatorsdk.operator.api.config.ConfigurationServiceProvider;
2121
import io.javaoperatorsdk.operator.api.config.DefaultControllerConfiguration;
2222
import io.javaoperatorsdk.operator.api.config.Version;
23-
import io.javaoperatorsdk.operator.api.reconciler.Constants;
24-
import io.javaoperatorsdk.operator.api.reconciler.Context;
25-
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
26-
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
27-
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
23+
import io.javaoperatorsdk.operator.api.reconciler.*;
2824
import io.javaoperatorsdk.operator.processing.event.rate.PeriodRateLimiter;
2925
import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
3026

@@ -142,7 +138,8 @@ public MyConfiguration() {
142138
}
143139
}
144140

145-
@ControllerConfiguration(namespaces = NAMESPACE)
141+
@ControllerConfiguration(namespaces = NAMESPACE,
142+
rateLimiter = @RateLimiter(limitForPeriod = PeriodRateLimiter.DEFAULT_LIMIT_FOR_PERIOD))
146143
public static class MyController implements Reconciler<TestCustomResource> {
147144

148145
private final Consumer<TestCustomResource> consumer;

0 commit comments

Comments
 (0)