feat: add missing fields on DependentResourceConfiguration

Author: metacosm

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

@@ -1,6 +1,10 @@
 package io.javaoperatorsdk.operator.api.reconciler.dependent;
 
+import java.util.Set;
+import java.util.function.Function;
+
 import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.javaoperatorsdk.operator.processing.event.ResourceID;
 import io.javaoperatorsdk.operator.processing.event.source.ResourceCache;
 import io.javaoperatorsdk.operator.processing.event.source.ResourceEventFilter;
 
@@ -10,6 +14,7 @@
   boolean CREATABLE_DEFAULT = true;
   boolean UPDATABLE_DEFAULT = false;
   boolean OWNED_DEFAULT = true;
+  boolean SKIP_UPDATE_DEFAULT = true;
 
   boolean creatable() default CREATABLE_DEFAULT;
 
@@ -25,6 +30,12 @@
 
   Class<? extends Fetcher> fetcher() default DEFAULT_FETCHER.class;
 
+  Class<? extends Function<? extends HasMetadata, Set<ResourceID>>> associatedPrimariesMapper() default DEFAULT_PRIMARIES_MAPPER.class;
+
+  Class<? extends Function<? extends HasMetadata, ? extends HasMetadata>> associatedSecondaryMapper() default DEFAULT_SECONDARY_MAPPER.class;
+
+  boolean skipUpdateIfUnchanged() default SKIP_UPDATE_DEFAULT;
+
   /**
    * Specified which namespaces this Controller monitors for custom resources events. If no
    * namespace is specified then the controller will monitor all namespaces by default.
@@ -75,4 +86,20 @@ public HasMetadata fetchFor(HasMetadata owner, ResourceCache cache) {
       return null;
     }
   }
+
+  final class DEFAULT_PRIMARIES_MAPPER implements Function<HasMetadata, Set<ResourceID>> {
+
+    @Override
+    public Set<ResourceID> apply(HasMetadata hasMetadata) {
+      return null;
+    }
+  }
+
+  final class DEFAULT_SECONDARY_MAPPER implements Function<HasMetadata, HasMetadata> {
+
+    @Override
+    public HasMetadata apply(HasMetadata hasMetadata) {
+      return null;
+    }
+  }
 }

operator-framework/src/main/java/io/javaoperatorsdk/operator/config/runtime/AnnotationConfiguration.java

@@ -16,6 +16,9 @@
 import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResourceConfiguration;
+import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResourceConfiguration.DEFAULT_PRIMARIES_MAPPER;
+import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResourceConfiguration.DEFAULT_SECONDARY_MAPPER;
+import io.javaoperatorsdk.operator.processing.event.ResourceID;
 import io.javaoperatorsdk.operator.processing.event.source.ResourceEventFilter;
 import io.javaoperatorsdk.operator.processing.event.source.ResourceEventFilters;
 
@@ -117,30 +120,32 @@ public List<? extends DependentResource> getDependentResources() {
     if (dependentConfigs.length > 0) {
       final List<DependentResource> result = new ArrayList<>(dependentConfigs.length);
       for (DependentResourceConfiguration dependentConfig : dependentConfigs) {
-        final var creatable = valueOrDefault(dependentConfig,
-            DependentResourceConfiguration::creatable,
-            DependentResourceConfiguration.CREATABLE_DEFAULT);
-        final var updatable = valueOrDefault(dependentConfig,
-            DependentResourceConfiguration::updatable,
-            DependentResourceConfiguration.UPDATABLE_DEFAULT);
-        final var owned = valueOrDefault(dependentConfig,
-            DependentResourceConfiguration::owned,
-            DependentResourceConfiguration.OWNED_DEFAULT);
-
-        final var resourceType =
-            valueOrDefault(dependentConfig, DependentResourceConfiguration::resourceType, null);
+        final var creatable = dependentConfig.creatable();
+        final var updatable = dependentConfig.updatable();
+        final var owned = dependentConfig.owned();
+
+        final var resourceType = dependentConfig.resourceType();
         final var crdName = CustomResource.getCRDName(resourceType);
         final var namespaces = Set.of(
             valueOrDefault(dependentConfig, DependentResourceConfiguration::namespaces,
                 new String[] {}));
-        final var labelSelector =
-            valueOrDefault(dependentConfig, DependentResourceConfiguration::labelSelector, "");
+        final var labelSelector = dependentConfig.labelSelector();
+
+        final Function<? extends HasMetadata, Set<ResourceID>> primariesMapper =
+            valueIfPresentOrNull(
+                dependentConfig, DependentResourceConfiguration::associatedPrimariesMapper,
+                DEFAULT_PRIMARIES_MAPPER.class);
+        final Function<? extends HasMetadata, ? extends HasMetadata> secondaryMapper =
+            valueIfPresentOrNull(
+                dependentConfig, DependentResourceConfiguration::associatedSecondaryMapper,
+                DEFAULT_SECONDARY_MAPPER.class);
+
 
         final DefaultDependentResourceConfiguration<? extends HasMetadata> configuration =
-            new DefaultDependentResourceConfiguration<>(
+            new DefaultDependentResourceConfiguration(
                 crdName, resourceType, namespaces, labelSelector, service, creatable, updatable,
-                owned,
-                null, null, true);
+                owned, primariesMapper, secondaryMapper,
+                dependentConfig.skipUpdateIfUnchanged());
 
         final var builder =
             valueIfPresentOrNull(dependentConfig, DependentResourceConfiguration::builder,