Merge branch 'next' into activation-condition

csviri · web-flow · commit a3f199440918 · 2023-11-14T15:52:56.000+01:00
diff --git a/bootstrapper-maven-plugin/pom.xml b/bootstrapper-maven-plugin/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>java-operator-sdk</artifactId>
     <groupId>io.javaoperatorsdk</groupId>
-    <version>4.5.1-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>bootstrapper</artifactId>
diff --git a/caffeine-bounded-cache-support/pom.xml b/caffeine-bounded-cache-support/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>java-operator-sdk</artifactId>
     <groupId>io.javaoperatorsdk</groupId>
-    <version>4.5.1-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/micrometer-support/pom.xml b/micrometer-support/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>java-operator-sdk</artifactId>
     <groupId>io.javaoperatorsdk</groupId>
-    <version>4.5.1-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/operator-framework-bom/pom.xml b/operator-framework-bom/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>io.javaoperatorsdk</groupId>
     <artifactId>operator-framework-bom</artifactId>
-    <version>4.5.1-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <name>Operator SDK - Bill of Materials</name>
     <packaging>pom</packaging>
     <description>Java SDK for implementing Kubernetes operators</description>
diff --git a/operator-framework-core/pom.xml b/operator-framework-core/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.javaoperatorsdk</groupId>
     <artifactId>java-operator-sdk</artifactId>
-    <version>4.5.1-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/rate/RateLimited.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/rate/RateLimited.java
@@ -1,11 +1,13 @@
 package io.javaoperatorsdk.operator.processing.event.rate;
 
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.util.concurrent.TimeUnit;
 
+@Inherited
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE})
 public @interface RateLimited {
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/retry/GradualRetry.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/retry/GradualRetry.java
@@ -1,10 +1,12 @@
 package io.javaoperatorsdk.operator.processing.retry;
 
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+@Inherited
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
 public @interface GradualRetry {
diff --git a/operator-framework-junit5/pom.xml b/operator-framework-junit5/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>java-operator-sdk</artifactId>
     <groupId>io.javaoperatorsdk</groupId>
-    <version>4.5.1-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/operator-framework/pom.xml b/operator-framework/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>java-operator-sdk</artifactId>
     <groupId>io.javaoperatorsdk</groupId>
-    <version>4.5.1-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/config/BaseConfigurationServiceTest.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/config/BaseConfigurationServiceTest.java
@@ -190,6 +190,24 @@ void configuringRateAndRetryViaAnnotationsShouldWork() {
     assertEquals(Duration.ofSeconds(3), rateLimiter.getRefreshPeriod());
   }
 
+  @Test
+  void configuringRateLimitAndGradualRetryViaSuperClassShouldWork() {
+    var config = configFor(new GradualRetryAndRateLimitedOnSuperClass());
+    final var retry = config.getRetry();
+    final var testRetry = assertInstanceOf(GenericRetry.class, retry);
+    assertEquals(
+        BaseClassWithGradualRetryAndRateLimited.RETRY_MAX_ATTEMPTS,
+        testRetry.getMaxAttempts());
+
+    final var rateLimiter = assertInstanceOf(LinearRateLimiter.class, config.getRateLimiter());
+    assertEquals(
+        BaseClassWithGradualRetryAndRateLimited.RATE_LIMITED_MAX_RECONCILIATIONS,
+        rateLimiter.getLimitForPeriod());
+    assertEquals(
+        Duration.ofSeconds(BaseClassWithGradualRetryAndRateLimited.RATE_LIMITED_WITHIN_SECONDS),
+        rateLimiter.getRefreshPeriod());
+  }
+
   @Test
   void checkingRetryingGraduallyWorks() {
     var config = configFor(new CheckRetryingGraduallyConfiguration());
@@ -250,6 +268,7 @@ public UpdateControl<ConfigMap> reconcile(ConfigMap resource, Context<ConfigMap>
   @ControllerConfiguration(
       dependents = @Dependent(type = ReadOnlyDependent.class, name = NamedDepReconciler.NAME))
   private static class NamedDepReconciler implements Reconciler<ConfigMap> {
+
     private static final String NAME = "foo";
 
     @Override
@@ -325,6 +344,7 @@ public UpdateControl<ConfigMap> reconcile(ConfigMap resource, Context<ConfigMap>
   }
 
   public static class TestRetry implements Retry, AnnotationConfigurable<TestRetryConfiguration> {
+
     private int value;
 
     public TestRetry() {}
@@ -347,6 +367,7 @@ public void initFrom(TestRetryConfiguration configuration) {
   @Target(ElementType.TYPE)
   @Retention(RetentionPolicy.RUNTIME)
   private @interface TestRetryConfiguration {
+
     int value() default 42;
   }
 
@@ -382,7 +403,30 @@ public UpdateControl<ConfigMap> reconcile(ConfigMap resource, Context<ConfigMap>
     }
   }
 
+  @ControllerConfiguration
+  private static class GradualRetryAndRateLimitedOnSuperClass
+      extends BaseClassWithGradualRetryAndRateLimited
+      implements Reconciler<ConfigMap> {
+
+    @Override
+    public UpdateControl<ConfigMap> reconcile(ConfigMap resource, Context<ConfigMap> context) {
+      return null;
+    }
+  }
+
+  @RateLimited(
+      maxReconciliations = BaseClassWithGradualRetryAndRateLimited.RATE_LIMITED_MAX_RECONCILIATIONS,
+      within = BaseClassWithGradualRetryAndRateLimited.RATE_LIMITED_WITHIN_SECONDS)
+  @GradualRetry(maxAttempts = BaseClassWithGradualRetryAndRateLimited.RETRY_MAX_ATTEMPTS)
+  private static class BaseClassWithGradualRetryAndRateLimited {
+
+    public static final int RATE_LIMITED_MAX_RECONCILIATIONS = 7;
+    public static final int RATE_LIMITED_WITHIN_SECONDS = 3;
+    public static final int RETRY_MAX_ATTEMPTS = 3;
+  }
+
   private static class ControllerConfigurationOnSuperClass extends BaseClass {
+
   }
 
   @ControllerConfiguration
@@ -443,10 +487,12 @@ private static class ChildCustomAnnotatedDep extends CustomAnnotatedDep {
 
   @Retention(RetentionPolicy.RUNTIME)
   private @interface CustomAnnotation {
+
     int value();
   }
 
   private static class CustomConfig {
+
     private final int value;
 
     private CustomConfig(int value) {
@@ -460,6 +506,7 @@ public int getValue() {
 
   private static class CustomConfigConverter
       implements ConfigurationConverter<CustomAnnotation, CustomConfig, CustomAnnotatedDep> {
+
     static final int CONVERTER_PROVIDED_DEFAULT = 7;
 
     @Override
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>io.javaoperatorsdk</groupId>
     <artifactId>java-operator-sdk</artifactId>
-    <version>4.5.1-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <name>Operator SDK for Java</name>
     <description>Java SDK for implementing Kubernetes operators</description>
     <packaging>pom</packaging>
diff --git a/sample-operators/leader-election/pom.xml b/sample-operators/leader-election/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.javaoperatorsdk</groupId>
         <artifactId>sample-operators</artifactId>
-        <version>4.5.1-SNAPSHOT</version>
+        <version>4.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sample-leader-election</artifactId>
diff --git a/sample-operators/mysql-schema/pom.xml b/sample-operators/mysql-schema/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.javaoperatorsdk</groupId>
         <artifactId>sample-operators</artifactId>
-        <version>4.5.1-SNAPSHOT</version>
+        <version>4.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sample-mysql-schema-operator</artifactId>
diff --git a/sample-operators/pom.xml b/sample-operators/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.javaoperatorsdk</groupId>
         <artifactId>java-operator-sdk</artifactId>
-        <version>4.5.1-SNAPSHOT</version>
+        <version>4.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sample-operators</artifactId>
diff --git a/sample-operators/tomcat-operator/pom.xml b/sample-operators/tomcat-operator/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.javaoperatorsdk</groupId>
         <artifactId>sample-operators</artifactId>
-        <version>4.5.1-SNAPSHOT</version>
+        <version>4.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sample-tomcat-operator</artifactId>
diff --git a/sample-operators/webpage/pom.xml b/sample-operators/webpage/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.javaoperatorsdk</groupId>
         <artifactId>sample-operators</artifactId>
-        <version>4.5.1-SNAPSHOT</version>
+        <version>4.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sample-webpage-operator</artifactId>
