fix: secondary to primary mapper supporting cluster scoped resource (#1770)

Author: csviri

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

@@ -14,10 +14,15 @@ public static ResourceID fromResource(HasMetadata resource) {
   }
 
   public static Optional<ResourceID> fromFirstOwnerReference(HasMetadata resource) {
+    return fromFirstOwnerReference(resource, false);
+  }
+
+  public static Optional<ResourceID> fromFirstOwnerReference(HasMetadata resource,
+      boolean clusterScoped) {
     var ownerReferences = resource.getMetadata().getOwnerReferences();
     if (!ownerReferences.isEmpty()) {
       return Optional.of(new ResourceID(ownerReferences.get(0).getName(),
-          resource.getMetadata().getNamespace()));
+          clusterScoped ? null : resource.getMetadata().getNamespace()));
     } else {
       return Optional.empty();
     }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/Mappers.java

@@ -42,7 +42,17 @@ public static <T extends HasMetadata> SecondaryToPrimaryMapper<T> fromLabel(
   }
 
   public static <T extends HasMetadata> SecondaryToPrimaryMapper<T> fromOwnerReference() {
-    return resource -> ResourceID.fromFirstOwnerReference(resource).map(Set::of)
+    return fromOwnerReference(false);
+  }
+
+  /**
+   * @param clusterScope if the owner is a cluster scoped resource
+   * @return mapper
+   * @param <T> type of the secondary resource, where the owner reference is
+   */
+  public static <T extends HasMetadata> SecondaryToPrimaryMapper<T> fromOwnerReference(
+      boolean clusterScope) {
+    return resource -> ResourceID.fromFirstOwnerReference(resource, clusterScope).map(Set::of)
         .orElseGet(Collections::emptySet);
   }
 

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/clusterscopedresource/ClusterScopedCustomResourceReconciler.java

@@ -6,37 +6,53 @@
 import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
 import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
 import io.fabric8.kubernetes.client.KubernetesClient;
+import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
 import io.javaoperatorsdk.operator.api.reconciler.*;
 import io.javaoperatorsdk.operator.junit.KubernetesClientAware;
+import io.javaoperatorsdk.operator.processing.event.source.EventSource;
+import io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource;
+import io.javaoperatorsdk.operator.processing.event.source.informer.Mappers;
 
 @ControllerConfiguration
 public class ClusterScopedCustomResourceReconciler
-    implements Reconciler<ClusterScopedCustomResource>, Cleaner<ClusterScopedCustomResource>,
-    KubernetesClientAware {
+    implements Reconciler<ClusterScopedCustomResource>,
+    KubernetesClientAware, EventSourceInitializer<ClusterScopedCustomResource> {
 
   public static final String DATA_KEY = "data-key";
 
+  public static final String TEST_LABEL_VALUE = "clusterscopecrtest";
+  public static final String TEST_LABEL_KEY = "test";
+
   private KubernetesClient client;
 
   @Override
   public UpdateControl<ClusterScopedCustomResource> reconcile(
       ClusterScopedCustomResource resource, Context<ClusterScopedCustomResource> context) {
 
-    client.configMaps().resource(desired(resource)).createOrReplace();
+    var optionalConfigMap = context.getSecondaryResource(ConfigMap.class);
+
+    optionalConfigMap.ifPresentOrElse(cm -> {
+      if (!resource.getSpec().getData().equals(cm.getData().get(DATA_KEY))) {
+        client.configMaps().resource(desired(resource)).replace();
+      }
+    }, () -> client.configMaps().resource(desired(resource)).create());
 
     resource.setStatus(new ClusterScopedCustomResourceStatus());
     resource.getStatus().setCreated(true);
     return UpdateControl.patchStatus(resource);
   }
 
   private ConfigMap desired(ClusterScopedCustomResource resource) {
-    return new ConfigMapBuilder()
+    var cm = new ConfigMapBuilder()
         .withMetadata(new ObjectMetaBuilder()
             .withName(resource.getMetadata().getName())
             .withNamespace(resource.getSpec().getTargetNamespace())
+            .withLabels(Map.of(TEST_LABEL_KEY, TEST_LABEL_VALUE))
             .build())
         .withData(Map.of(DATA_KEY, resource.getSpec().getData()))
         .build();
+    cm.addOwnerReference(resource);
+    return cm;
   }
 
   @Override
@@ -50,9 +66,12 @@ public void setKubernetesClient(KubernetesClient kubernetesClient) {
   }
 
   @Override
-  public DeleteControl cleanup(ClusterScopedCustomResource resource,
-      Context<ClusterScopedCustomResource> context) {
-    client.configMaps().resource(desired(resource)).delete();
-    return DeleteControl.defaultDelete();
+  public Map<String, EventSource> prepareEventSources(
+      EventSourceContext<ClusterScopedCustomResource> context) {
+    var ies = new InformerEventSource<>(InformerConfiguration.from(ConfigMap.class, context)
+        .withSecondaryToPrimaryMapper(Mappers.fromOwnerReference(true))
+        .withLabelSelector(TEST_LABEL_KEY + "=" + TEST_LABEL_VALUE)
+        .build(), context);
+    return EventSourceInitializer.nameEventSources(ies);
   }
 }