Annotation config + controller IT

Signed-off-by: Attila Mészáros <[email protected]>

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/Field.java

@@ -0,0 +1,8 @@
+package io.javaoperatorsdk.operator.api.config.informer;
+
+public @interface Field {
+
+  String field();
+
+  String value();
+}

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/Informer.java

@@ -113,4 +113,10 @@
    * the informer cache.
    */
   long informerListLimit() default NO_LONG_VALUE_SET;
+
+  /** Field selector for informer, for matching field with the value: field=value; */
+  Field[] withFields() default {};
+
+  /** Negated field selector for informer, for Non-matching field with the value: field!=value; */
+  Field[] withoutFields() default {};
 }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerConfiguration.java

@@ -2,6 +2,7 @@
 
 import java.util.AbstractMap;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -55,7 +56,9 @@ protected InformerConfiguration(
       OnDeleteFilter<? super R> onDeleteFilter,
       GenericFilter<? super R> genericFilter,
       ItemStore<R> itemStore,
-      Long informerListLimit) {
+      Long informerListLimit,
+      Map<String, String> withFields,
+      List<AbstractMap.SimpleEntry<String, String>> withoutFields) {
     this(resourceClass);
     this.name = name;
     this.namespaces = namespaces;
@@ -67,6 +70,8 @@ protected InformerConfiguration(
     this.genericFilter = genericFilter;
     this.itemStore = itemStore;
     this.informerListLimit = informerListLimit;
+    this.withFields = withFields;
+    this.withoutFields = withoutFields;
   }
 
   private InformerConfiguration(Class<R> resourceClass) {
@@ -100,7 +105,9 @@ public static <R extends HasMetadata> InformerConfiguration<R>.Builder builder(
             original.onDeleteFilter,
             original.genericFilter,
             original.itemStore,
-            original.informerListLimit)
+            original.informerListLimit,
+            original.withFields,
+            original.withoutFields)
         .builder;
   }
 
@@ -344,6 +351,10 @@ public InformerConfiguration<R>.Builder initFromAnnotation(
         final var informerListLimit =
             informerListLimitValue == Constants.NO_LONG_VALUE_SET ? null : informerListLimitValue;
         withInformerListLimit(informerListLimit);
+
+        Arrays.stream(informerConfig.withFields()).forEach(f -> withField(f.field(), f.value()));
+        Arrays.stream(informerConfig.withoutFields())
+            .forEach(f -> withoutField(f.field(), f.value()));
       }
       return this;
     }

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/fieldselector/FieldSelectorIT.java

@@ -0,0 +1,52 @@
+package io.javaoperatorsdk.operator.baseapi.fieldselector;
+
+import java.time.Duration;
+import java.util.Map;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
+import io.fabric8.kubernetes.api.model.SecretBuilder;
+import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
+
+import static io.javaoperatorsdk.operator.baseapi.fieldselector.FieldSelectorTestReconciler.MY_SECRET_TYPE;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+
+class FieldSelectorIT {
+
+  public static final String TEST_1 = "test1";
+  public static final String TEST_2 = "test2";
+
+  @RegisterExtension
+  LocallyRunOperatorExtension extension =
+      LocallyRunOperatorExtension.builder()
+          .withReconciler(new FieldSelectorTestReconciler())
+          .build();
+
+  @Test
+  void filtersCustomResourceByLabel() {
+
+    extension.create(
+        new SecretBuilder()
+            .withMetadata(new ObjectMetaBuilder().withName(TEST_1).build())
+            .withStringData(Map.of("key1", "value1"))
+            .withType(MY_SECRET_TYPE)
+            .build());
+
+    extension.create(
+        new SecretBuilder()
+            .withMetadata(new ObjectMetaBuilder().withName(TEST_2).build())
+            .withStringData(Map.of("key2", "value2"))
+            .build());
+
+    await()
+        .pollDelay(Duration.ofMillis(150))
+        .untilAsserted(
+            () -> {
+              var r = extension.getReconcilerOfType(FieldSelectorTestReconciler.class);
+              assertThat(r.getReconciledSecrets()).containsExactly(TEST_1);
+            });
+  }
+}

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/fieldselector/FieldSelectorTestReconciler.java

@@ -0,0 +1,43 @@
+package io.javaoperatorsdk.operator.baseapi.fieldselector;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import io.fabric8.kubernetes.api.model.Secret;
+import io.javaoperatorsdk.operator.api.config.informer.Field;
+import io.javaoperatorsdk.operator.api.config.informer.Informer;
+import io.javaoperatorsdk.operator.api.reconciler.Context;
+import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
+import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
+import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
+import io.javaoperatorsdk.operator.support.TestExecutionInfoProvider;
+
+@ControllerConfiguration(
+    informer =
+        @Informer(
+            withFields =
+                @Field(field = "type", value = FieldSelectorTestReconciler.MY_SECRET_TYPE)))
+public class FieldSelectorTestReconciler implements Reconciler<Secret>, TestExecutionInfoProvider {
+
+  public static final String MY_SECRET_TYPE = "my-secret-type";
+  private final AtomicInteger numberOfExecutions = new AtomicInteger(0);
+
+  private Set<String> reconciledSecrets = Collections.synchronizedSet(new HashSet<>());
+
+  @Override
+  public UpdateControl<Secret> reconcile(Secret resource, Context<Secret> context) {
+    reconciledSecrets.add(resource.getMetadata().getName());
+    numberOfExecutions.addAndGet(1);
+    return UpdateControl.noUpdate();
+  }
+
+  public int getNumberOfExecutions() {
+    return numberOfExecutions.get();
+  }
+
+  public Set<String> getReconciledSecrets() {
+    return reconciledSecrets;
+  }
+}