wip

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

Author: csviri

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/simple/ReconcilerExecutorIT.java

@@ -52,7 +52,7 @@ void configMapGetsCreatedForTestCustomResource() {
 
     awaitResourcesCreatedOrUpdated();
     awaitStatusUpdated();
-    assertThat(TestUtils.getNumberOfExecutions(operator)).isEqualTo(2);
+    assertThat(TestUtils.getNumberOfExecutions(operator)).isEqualTo(1);
   }
 
   @Test

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/simple/TestReconciler.java

@@ -16,6 +16,7 @@
 package io.javaoperatorsdk.operator.baseapi.simple;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -26,7 +27,10 @@
 import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
 import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
 import io.javaoperatorsdk.operator.ReconcilerUtilsInternal;
+import io.javaoperatorsdk.operator.api.config.informer.InformerEventSourceConfiguration;
 import io.javaoperatorsdk.operator.api.reconciler.*;
+import io.javaoperatorsdk.operator.processing.event.source.EventSource;
+import io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource;
 import io.javaoperatorsdk.operator.support.TestExecutionInfoProvider;
 
 @ControllerConfiguration(generationAwareEventProcessing = false)
@@ -52,55 +56,20 @@ public void setUpdateStatus(boolean updateStatus) {
     this.updateStatus = updateStatus;
   }
 
-  @Override
-  public DeleteControl cleanup(TestCustomResource resource, Context<TestCustomResource> context) {
-    numberOfCleanupExecutions.incrementAndGet();
-
-    var statusDetail =
-        context
-            .getClient()
-            .configMaps()
-            .inNamespace(resource.getMetadata().getNamespace())
-            .withName(resource.getSpec().getConfigMapName())
-            .delete();
-
-    if (statusDetail.size() == 1 && statusDetail.get(0).getCauses().isEmpty()) {
-      log.info(
-          "Deleted ConfigMap {} for resource: {}",
-          resource.getSpec().getConfigMapName(),
-          resource.getMetadata().getName());
-    } else {
-      log.error(
-          "Failed to delete ConfigMap {} for resource: {}",
-          resource.getSpec().getConfigMapName(),
-          resource.getMetadata().getName());
-    }
-    return DeleteControl.defaultDelete();
-  }
-
   @Override
   public UpdateControl<TestCustomResource> reconcile(
       TestCustomResource resource, Context<TestCustomResource> context) {
     numberOfExecutions.addAndGet(1);
     if (!resource.getMetadata().getFinalizers().contains(FINALIZER_NAME)) {
       throw new IllegalStateException("Finalizer is not present.");
     }
-    final var kubernetesClient = context.getClient();
-    ConfigMap existingConfigMap =
-        kubernetesClient
-            .configMaps()
-            .inNamespace(resource.getMetadata().getNamespace())
-            .withName(resource.getSpec().getConfigMapName())
-            .get();
+
+    var existingConfigMap = context.getSecondaryResource(ConfigMap.class).orElse(null);
 
     if (existingConfigMap != null) {
       existingConfigMap.setData(configMapData(resource));
-      // existingConfigMap.getMetadata().setResourceVersion(null);
-      kubernetesClient
-          .configMaps()
-          .inNamespace(resource.getMetadata().getNamespace())
-          .resource(existingConfigMap)
-          .createOrReplace();
+      log.info("Updating config map");
+      ReconcileUtils.serverSideApply(context, existingConfigMap);
     } else {
       Map<String, String> labels = new HashMap<>();
       labels.put("managedBy", TestReconciler.class.getSimpleName());
@@ -114,11 +83,8 @@ public UpdateControl<TestCustomResource> reconcile(
                       .build())
               .withData(configMapData(resource))
               .build();
-      kubernetesClient
-          .configMaps()
-          .inNamespace(resource.getMetadata().getNamespace())
-          .resource(newConfigMap)
-          .createOrReplace();
+      log.info("Creating config map");
+      ReconcileUtils.serverSideApply(context, newConfigMap);
     }
     if (updateStatus) {
       var statusUpdateResource = new TestCustomResource();
@@ -129,11 +95,49 @@ public UpdateControl<TestCustomResource> reconcile(
               .build());
       resource.setStatus(new TestCustomResourceStatus());
       resource.getStatus().setConfigMapStatus("ConfigMap Ready");
+      log.info("Patching status");
       return UpdateControl.patchStatus(resource);
     }
     return UpdateControl.noUpdate();
   }
 
+  @Override
+  public DeleteControl cleanup(TestCustomResource resource, Context<TestCustomResource> context) {
+    numberOfCleanupExecutions.incrementAndGet();
+
+    var statusDetail =
+        context
+            .getClient()
+            .configMaps()
+            .inNamespace(resource.getMetadata().getNamespace())
+            .withName(resource.getSpec().getConfigMapName())
+            .delete();
+
+    if (statusDetail.size() == 1 && statusDetail.get(0).getCauses().isEmpty()) {
+      log.info(
+          "Deleted ConfigMap {} for resource: {}",
+          resource.getSpec().getConfigMapName(),
+          resource.getMetadata().getName());
+    } else {
+      log.error(
+          "Failed to delete ConfigMap {} for resource: {}",
+          resource.getSpec().getConfigMapName(),
+          resource.getMetadata().getName());
+    }
+    return DeleteControl.defaultDelete();
+  }
+
+  @Override
+  public List<EventSource<?, TestCustomResource>> prepareEventSources(
+      EventSourceContext<TestCustomResource> context) {
+    InformerEventSource<ConfigMap, TestCustomResource> es =
+        new InformerEventSource<>(
+            InformerEventSourceConfiguration.from(ConfigMap.class, TestCustomResource.class)
+                .build(),
+            context);
+    return List.of(es);
+  }
+
   private Map<String, String> configMapData(TestCustomResource resource) {
     Map<String, String> data = new HashMap<>();
     data.put(resource.getSpec().getKey(), resource.getSpec().getValue());