pure resource handling test

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

Author: csviri

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

@@ -275,6 +275,9 @@ static <R extends HasMetadata> InformerConfigurationBuilder<R> from(
     return new InformerConfigurationBuilder<>(resourceClass);
   }
 
+  /**
+   * * For the case when want to use {@link GenericKubernetesResource}
+   */
   static <R extends HasMetadata> InformerConfigurationBuilder<R> from(
       GroupVersionKind groupVersionKind) {
     return new InformerConfigurationBuilder<>(groupVersionKind);
@@ -295,10 +298,13 @@ static <R extends HasMetadata> InformerConfigurationBuilder<R> from(
         .withNamespacesInheritedFromController(eventSourceContext);
   }
 
+  /**
+   * * For the case when want to use {@link GenericKubernetesResource}
+   */
   @SuppressWarnings("unchecked")
-  static <R extends HasMetadata> InformerConfigurationBuilder<R> from(
+  static InformerConfigurationBuilder<GenericKubernetesResource> from(
       GroupVersionKind groupVersionKind, EventSourceContext<?> eventSourceContext) {
-    return (InformerConfigurationBuilder<R>) new InformerConfigurationBuilder<>(groupVersionKind)
+    return new InformerConfigurationBuilder<GenericKubernetesResource>(groupVersionKind)
         .withNamespacesInheritedFromController(eventSourceContext);
   }
 

operator-framework/src/test/java/io/javaoperatorsdk/operator/GenericKubernetesDependentManagedIT.java

@@ -11,8 +11,6 @@
 public class GenericKubernetesDependentManagedIT
     extends GenericKubernetesDependentTestBase<GenericKubernetesDependentManagedCustomResource> {
 
-  public static final String INITIAL_DATA = "Initial data";
-
   @RegisterExtension
   LocallyRunOperatorExtension extension =
       LocallyRunOperatorExtension.builder()

operator-framework/src/test/java/io/javaoperatorsdk/operator/GenericKubernetesDependentTestBase.java

@@ -1,5 +1,7 @@
 package io.javaoperatorsdk.operator;
 
+import java.time.Duration;
+
 import org.junit.jupiter.api.Test;
 
 import io.fabric8.kubernetes.api.model.ConfigMap;
@@ -8,8 +10,6 @@
 import io.javaoperatorsdk.operator.sample.generickubernetesresource.GenericKubernetesDependentSpec;
 import io.javaoperatorsdk.operator.sample.generickubernetesresource.generickubernetesdependentstandalone.ConfigMapGenericKubernetesDependent;
 
-import java.time.Duration;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 

operator-framework/src/test/java/io/javaoperatorsdk/operator/GenericKubernetesResourceHandlingIT.java

@@ -0,0 +1,36 @@
+package io.javaoperatorsdk.operator;
+
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
+import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
+import io.javaoperatorsdk.operator.sample.generickubernetesresource.GenericKubernetesDependentSpec;
+import io.javaoperatorsdk.operator.sample.generickubernetesresource.generickubernetesresourcehandling.GenericKubernetesResourceHandlingCustomResource;
+import io.javaoperatorsdk.operator.sample.generickubernetesresource.generickubernetesresourcehandling.GenericKubernetesResourceHandlingReconciler;
+
+public class GenericKubernetesResourceHandlingIT
+    extends GenericKubernetesDependentTestBase<GenericKubernetesResourceHandlingCustomResource> {
+
+  @RegisterExtension
+  LocallyRunOperatorExtension extension =
+      LocallyRunOperatorExtension.builder()
+          .withReconciler(new GenericKubernetesResourceHandlingReconciler())
+          .build();
+
+  @Override
+  public LocallyRunOperatorExtension extension() {
+    return extension;
+  }
+
+  @Override
+  GenericKubernetesResourceHandlingCustomResource testResource(String name, String data) {
+    var resource = new GenericKubernetesResourceHandlingCustomResource();
+    resource.setMetadata(new ObjectMetaBuilder()
+        .withName(name)
+        .build());
+    resource.setSpec(new GenericKubernetesDependentSpec());
+    resource.getSpec().setValue(INITIAL_DATA);
+    return resource;
+  }
+
+}

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/generickubernetesresource/generickubernetesresourcehandling/GenericKubernetesResourceHandlingCustomResource.java

@@ -0,0 +1,16 @@
+package io.javaoperatorsdk.operator.sample.generickubernetesresource.generickubernetesresourcehandling;
+
+import io.fabric8.kubernetes.api.model.Namespaced;
+import io.fabric8.kubernetes.client.CustomResource;
+import io.fabric8.kubernetes.model.annotation.Group;
+import io.fabric8.kubernetes.model.annotation.ShortNames;
+import io.fabric8.kubernetes.model.annotation.Version;
+import io.javaoperatorsdk.operator.sample.generickubernetesresource.GenericKubernetesDependentSpec;
+
+@Group("sample.javaoperatorsdk")
+@Version("v1")
+@ShortNames("gkrr")
+public class GenericKubernetesResourceHandlingCustomResource
+    extends CustomResource<GenericKubernetesDependentSpec, Void>
+    implements Namespaced {
+}

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/generickubernetesresource/generickubernetesresourcehandling/GenericKubernetesResourceHandlingReconciler.java

@@ -0,0 +1,77 @@
+package io.javaoperatorsdk.operator.sample.generickubernetesresource.generickubernetesresourcehandling;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
+import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
+import io.javaoperatorsdk.operator.api.reconciler.*;
+import io.javaoperatorsdk.operator.processing.GroupVersionKind;
+import io.javaoperatorsdk.operator.processing.event.source.EventSource;
+import io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource;
+
+@ControllerConfiguration
+public class GenericKubernetesResourceHandlingReconciler
+    implements Reconciler<GenericKubernetesResourceHandlingCustomResource>,
+    EventSourceInitializer<GenericKubernetesResourceHandlingCustomResource> {
+
+
+  public static final String VERSION = "v1";
+  public static final String KIND = "ConfigMap";
+  public static final String KEY = "key";
+
+  @Override
+  public UpdateControl<GenericKubernetesResourceHandlingCustomResource> reconcile(
+      GenericKubernetesResourceHandlingCustomResource primary,
+      Context<GenericKubernetesResourceHandlingCustomResource> context) {
+
+    var secondary = context.getSecondaryResource(GenericKubernetesResource.class);
+
+    secondary.ifPresentOrElse(r -> {
+      var desired = desiredConfigMap(primary, context);
+      if (!matches(r, desired)) {
+        context.getClient().genericKubernetesResources(VERSION, KIND).resource(desired).update();
+      }
+    }, () -> context.getClient().genericKubernetesResources(VERSION, KIND)
+        .resource(desiredConfigMap(primary, context)).create());
+
+    return UpdateControl.noUpdate();
+  }
+
+  @SuppressWarnings("unchecked")
+  private boolean matches(GenericKubernetesResource actual, GenericKubernetesResource desired) {
+    var actualData = (HashMap<String, String>) actual.getAdditionalProperties().get("data");
+    var desiredData = (HashMap<String, String>) desired.getAdditionalProperties().get("data");
+    return actualData.equals(desiredData);
+  }
+
+  GenericKubernetesResource desiredConfigMap(
+      GenericKubernetesResourceHandlingCustomResource primary,
+      Context<GenericKubernetesResourceHandlingCustomResource> context) {
+    try (InputStream is = this.getClass().getResourceAsStream("/configmap.yaml")) {
+      var res = context.getClient().genericKubernetesResources(VERSION, KIND).load(is).item();
+      res.getMetadata().setName(primary.getMetadata().getName());
+      res.getMetadata().setNamespace(primary.getMetadata().getNamespace());
+      Map<String, String> data = (Map<String, String>) res.getAdditionalProperties().get("data");
+      data.put(KEY, primary.getSpec().getValue());
+      res.addOwnerReference(primary);
+      return res;
+    } catch (IOException e) {
+      throw new IllegalStateException(e);
+    }
+  }
+
+
+  @Override
+  public Map<String, EventSource> prepareEventSources(
+      EventSourceContext<GenericKubernetesResourceHandlingCustomResource> context) {
+
+    var informerEventSource = new InformerEventSource<>(InformerConfiguration.from(
+        new GroupVersionKind("", VERSION, KIND), context).build(),
+        context);
+
+    return EventSourceInitializer.nameEventSources(informerEventSource);
+  }
+}