static secondary to primary mapper handling

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

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentConverter.java

@@ -11,6 +11,7 @@
 import io.javaoperatorsdk.operator.api.config.dependent.DependentResourceSpec;
 import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
 import io.javaoperatorsdk.operator.api.reconciler.Constants;
+import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
 import io.javaoperatorsdk.operator.processing.GroupVersionKind;
 import io.javaoperatorsdk.operator.processing.event.source.PrimaryToSecondaryMapper;
 import io.javaoperatorsdk.operator.processing.event.source.SecondaryToPrimaryMapper;
@@ -19,6 +20,7 @@
 import io.javaoperatorsdk.operator.processing.event.source.filter.OnDeleteFilter;
 import io.javaoperatorsdk.operator.processing.event.source.filter.OnUpdateFilter;
 
+import static io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResource.getSecondaryToPrimaryMapper;
 import static io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResourceConfig.DEFAULT_CREATE_RESOURCE_ONLY_IF_NOT_EXISTING_WITH_SSA;
 
 public class KubernetesDependentConverter<R extends HasMetadata, P extends HasMetadata> implements
@@ -55,18 +57,17 @@ private InformerConfiguration<R> createInformerConfiguration(KubernetesDependent
       ControllerConfiguration<?> controllerConfig,
       DependentResourceSpec<?, ?> spec) {
     try {
-      Class<? extends KubernetesDependentResource<?, ?>> originatingClass =
+      Class<? extends KubernetesDependentResource<?, ?>> dependentResourceClass =
           (Class<? extends KubernetesDependentResource<?, ?>>) spec.getDependentResourceClass();
-      var dependentInstance = originatingClass.getConstructor().newInstance();
-      var resourceType = dependentInstance.resourceType();
+      var resourceType = dependentResourceClass.getConstructor().newInstance().resourceType();
 
       InformerConfiguration.InformerConfigurationBuilder informerConfig;
       if (configAnnotation != null && configAnnotation.informerConfig() != null &&
           !Constants.NO_VALUE_SET.equals(configAnnotation.informerConfig().groupVersionKind())) {
 
         if (!GenericKubernetesResource.class.isAssignableFrom(resourceType)) {
           throw new IllegalStateException("If GroupVersionKind is set the resource type must be " +
-              "GenericKubernetesDependentResource. For: " + originatingClass.getName());
+              "GenericKubernetesDependentResource. For: " + dependentResourceClass.getName());
         }
 
         informerConfig = InformerConfiguration.from(
@@ -77,17 +78,14 @@ private InformerConfiguration<R> createInformerConfiguration(KubernetesDependent
             InformerConfiguration.from(resourceType, controllerConfig.getResourceClass());
       }
 
-      informerConfig.withSecondaryToPrimaryMapper(
-          dependentInstance.getSecondaryToPrimaryMapper().orElse(null));
-
       if (configAnnotation != null && configAnnotation.informerConfig() != null) {
 
         if (!Constants.NO_VALUE_SET.equals(configAnnotation.informerConfig().name())) {
-          informerConfig.withName(dependentInstance.name());
+          informerConfig.withName(configAnnotation.informerConfig().name());
         } else if (spec.getName() != null && !Constants.NO_VALUE_SET.equals(spec.getName())) {
           informerConfig.withName(spec.getName());
         } else {
-          informerConfig.withName(dependentInstance.name());
+          informerConfig.withName(DependentResource.defaultNameFor(dependentResourceClass));
         }
 
         var namespaces = Set.of(configAnnotation.informerConfig().namespaces());
@@ -97,7 +95,7 @@ private InformerConfiguration<R> createInformerConfiguration(KubernetesDependent
         var labelSelector = Constants.NO_VALUE_SET.equals(fromAnnotation) ? null : fromAnnotation;
         informerConfig.withLabelSelector(labelSelector);
 
-        final var context = Utils.contextFor(controllerConfig, originatingClass,
+        final var context = Utils.contextFor(controllerConfig, dependentResourceClass,
             configAnnotation.annotationType());
 
         var onAddFilter = Utils.instantiate(configAnnotation.informerConfig().onAddFilter(),
@@ -135,15 +133,24 @@ private InformerConfiguration<R> createInformerConfiguration(KubernetesDependent
         if (secondaryToPrimaryMapper != null) {
           informerConfig.withSecondaryToPrimaryMapper(secondaryToPrimaryMapper);
         }
-
+      } else {
+        var mapper = getSecondaryToPrimaryMapper(dependentResourceClass,
+            controllerConfig.getResourceClass()).orElseThrow(
+                () -> new IllegalStateException(
+                    "No suitable SecondaryToPrimaryMapper for informer of dependent resource: "
+                        + dependentResourceClass.getName()));
+        informerConfig.withSecondaryToPrimaryMapper(mapper);
       }
 
+
+
       return informerConfig.build();
     } catch (InstantiationException | IllegalAccessException | InvocationTargetException
         | NoSuchMethodException e) {
       throw new RuntimeException(e);
     }
-
   }
 
+
+
 }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java

@@ -21,6 +21,7 @@
 import io.javaoperatorsdk.operator.api.reconciler.dependent.GarbageCollected;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.managed.DependentResourceConfigurator;
 import io.javaoperatorsdk.operator.processing.dependent.AbstractEventSourceHolderDependentResource;
+import io.javaoperatorsdk.operator.processing.dependent.Creator;
 import io.javaoperatorsdk.operator.processing.dependent.Matcher.Result;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.updatermatcher.GenericResourceUpdaterMatcher;
 import io.javaoperatorsdk.operator.processing.event.ResourceID;
@@ -72,15 +73,6 @@ public void configureWith(KubernetesDependentResourceConfig<R> config) {
     this.kubernetesDependentResourceConfig = config;
   }
 
-  public Optional<SecondaryToPrimaryMapper<R>> getSecondaryToPrimaryMapper() {
-    if (garbageCollected) {
-      return Optional.of(Mappers.fromOwnerReferences(getPrimaryResourceType(), clustered));
-    } else if (useNonOwnerRefBasedSecondaryToPrimaryMapping()) {
-      return Optional.of(Mappers.fromDefaultAnnotations());
-    } else {
-      return Optional.empty();
-    }
-  }
 
   @SuppressWarnings("unused")
   public R create(R desired, P primary, Context<P> context) {
@@ -224,6 +216,7 @@ protected void addReferenceHandlingMetadata(R desired, P primary) {
     }
   }
 
+  @SuppressWarnings("unchecked")
   @Override
   protected InformerEventSource<R, P> createEventSource(EventSourceContext<P> context) {
     InformerConfiguration<R> config;
@@ -234,7 +227,9 @@ protected InformerEventSource<R, P> createEventSource(EventSourceContext<P> cont
 
       config = informerConfigurationBuilder()
           .withName(name())
-          .withSecondaryToPrimaryMapper(getSecondaryToPrimaryMapper().orElseThrow())
+          .withSecondaryToPrimaryMapper(
+              (SecondaryToPrimaryMapper<R>) getSecondaryToPrimaryMapper(this.getClass(),
+                  getPrimaryResourceType()).orElseThrow())
           .build();
     }
     var es = new InformerEventSource<>(config, context);
@@ -310,4 +305,19 @@ public boolean isDeletable() {
     return super.isDeletable() && !garbageCollected;
   }
 
+  @SuppressWarnings("rawtypes")
+  public static Optional<SecondaryToPrimaryMapper<?>> getSecondaryToPrimaryMapper(
+      Class<? extends KubernetesDependentResource> drClass,
+      Class<? extends HasMetadata> primaryResourceClass) {
+
+    if (GarbageCollected.class.isAssignableFrom(drClass)) {
+      var clustered = !Namespaced.class.isAssignableFrom(primaryResourceClass);
+      return Optional.of(Mappers.fromOwnerReferences(primaryResourceClass, clustered));
+    } else if (!GarbageCollected.class.isAssignableFrom(drClass)
+        && Creator.class.isAssignableFrom(drClass)) {
+      return Optional.of(Mappers.fromDefaultAnnotations());
+    } else {
+      return Optional.empty();
+    }
+  }
 }