IT skeleton

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

Author: csviri

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

@@ -31,6 +31,7 @@ protected DefaultResourceConfiguration(Class<R> resourceClass,
       ItemStore<R> itemStore, Long informerListLimit) {
     this.resourceClass = resourceClass;
     this.resourceTypeName = resourceClass.isAssignableFrom(GenericKubernetesResource.class)
+        // todo better handling?
         ? GENERIC_KUBERNETES_RESOURCE
         : ReconcilerUtils.getResourceTypeName(resourceClass);
     this.onAddFilter = onAddFilter;

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

@@ -13,6 +13,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.client.informers.ExceptionHandler;
 import io.fabric8.kubernetes.client.informers.ResourceEventHandler;
@@ -113,6 +114,10 @@ public void start() throws OperatorException {
 
   private String versionedFullResourceName() {
     final var apiTypeClass = informer.getApiTypeClass();
+    // todo better messages handling
+    if (apiTypeClass.isAssignableFrom(GenericKubernetesResource.class)) {
+      return "GenericKubernetesResource";
+    }
     return ReconcilerUtils.getResourceTypeNameWithVersion(apiTypeClass);
   }
 

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

@@ -33,15 +33,13 @@ public abstract class ManagedInformerEventSource<R extends HasMetadata, P extend
 
   private static final Logger log = LoggerFactory.getLogger(ManagedInformerEventSource.class);
   private InformerManager<R, C> cache;
-  private boolean parseResourceVersions;
+  private final boolean parseResourceVersions;
   private ConfigurationService configurationService;
-  private C configuration;
+  private final C configuration;
   private Map<String, Function<R, List<String>>> indexers = new HashMap<>();
   protected TemporaryResourceCache<R> temporaryResourceCache;
   protected MixedOperation client;
 
-
-
   protected ManagedInformerEventSource(
       MixedOperation client, C configuration,
       boolean parseResourceVersions) {

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

@@ -0,0 +1,48 @@
+package io.javaoperatorsdk.operator;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.fabric8.kubernetes.api.model.ConfigMap;
+import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
+import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
+import io.javaoperatorsdk.operator.sample.generickubernetesdependentresourcemanaged.GenericKubernetesDependentManagedCustomResource;
+import io.javaoperatorsdk.operator.sample.generickubernetesdependentresourcemanaged.GenericKubernetesDependentManagedReconciler;
+import io.javaoperatorsdk.operator.sample.generickubernetesdependentresourcemanaged.GenericKubernetesDependentManagedSpec;
+import io.javaoperatorsdk.operator.sample.generickubernetesdependentstandalone.ConfigMapGenericKubernetesDependent;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+
+public class GenericKubernetesDependentManagedIT {
+
+  public static final String INITIAL_DATA = "Initial data";
+
+  @RegisterExtension
+  LocallyRunOperatorExtension operator =
+      LocallyRunOperatorExtension.builder()
+          .withReconciler(new GenericKubernetesDependentManagedReconciler())
+          .build();
+
+  @Test
+  void testReconcile() {
+    operator.create(testResource());
+
+    await().untilAsserted(() -> {
+      var cm = operator.get(ConfigMap.class, "test1");
+      assertThat(cm).isNotNull();
+      assertThat(cm.getData()).containsEntry(ConfigMapGenericKubernetesDependent.KEY, INITIAL_DATA);
+    });
+  }
+
+  GenericKubernetesDependentManagedCustomResource testResource() {
+    var resource = new GenericKubernetesDependentManagedCustomResource();
+    resource.setMetadata(new ObjectMetaBuilder()
+        .withName("test1")
+        .build());
+    resource.setSpec(new GenericKubernetesDependentManagedSpec());
+    resource.getSpec().setValue(INITIAL_DATA);
+    return resource;
+  }
+
+}

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

@@ -24,11 +24,9 @@ public class GenericKubernetesDependentStandaloneIT {
   @RegisterExtension
   LocallyRunOperatorExtension operator =
       LocallyRunOperatorExtension.builder()
-          .withConfigurationService(o -> o.withCloseClientOnStop(false))
           .withReconciler(new GenericKubernetesDependentStandaloneReconciler())
           .build();
 
-
   @Test
   void testReconcile() {
     operator.create(testResource());

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/generickubernetesdependentresourcemanaged/ConfigMapGenericKubernetesDependent.java

@@ -0,0 +1,46 @@
+package io.javaoperatorsdk.operator.sample.generickubernetesdependentresourcemanaged;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map;
+
+import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
+import io.javaoperatorsdk.operator.api.reconciler.Context;
+import io.javaoperatorsdk.operator.api.reconciler.dependent.GarbageCollected;
+import io.javaoperatorsdk.operator.processing.GroupVersionKind;
+import io.javaoperatorsdk.operator.processing.dependent.Creator;
+import io.javaoperatorsdk.operator.processing.dependent.Updater;
+import io.javaoperatorsdk.operator.processing.dependent.kubernetes.GenericKubernetesDependentResource;
+
+public class ConfigMapGenericKubernetesDependent extends
+    GenericKubernetesDependentResource<GenericKubernetesDependentManagedCustomResource>
+    implements
+    Creator<GenericKubernetesResource, GenericKubernetesDependentManagedCustomResource>,
+    Updater<GenericKubernetesResource, GenericKubernetesDependentManagedCustomResource>,
+    GarbageCollected<GenericKubernetesDependentManagedCustomResource> {
+
+  public static final String VERSION = "v1";
+  public static final String KIND = "ConfigMap";
+  public static final String KEY = "key";
+
+  public ConfigMapGenericKubernetesDependent() {
+    super(new GroupVersionKind("", VERSION, KIND));
+  }
+
+  @Override
+  protected GenericKubernetesResource desired(
+      GenericKubernetesDependentManagedCustomResource primary,
+      Context<GenericKubernetesDependentManagedCustomResource> 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());
+      return res;
+    } catch (IOException e) {
+      throw new IllegalStateException(e);
+    }
+  }
+}

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/generickubernetesdependentresourcemanaged/GenericKubernetesDependentManagedCustomResource.java

@@ -0,0 +1,15 @@
+package io.javaoperatorsdk.operator.sample.generickubernetesdependentresourcemanaged;
+
+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;
+
+@Group("sample.javaoperatorsdk")
+@Version("v1")
+@ShortNames("gkdm")
+public class GenericKubernetesDependentManagedCustomResource
+    extends CustomResource<GenericKubernetesDependentManagedSpec, Void>
+    implements Namespaced {
+}

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/generickubernetesdependentresourcemanaged/GenericKubernetesDependentManagedReconciler.java

@@ -0,0 +1,19 @@
+package io.javaoperatorsdk.operator.sample.generickubernetesdependentresourcemanaged;
+
+import io.javaoperatorsdk.operator.api.reconciler.*;
+import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
+
+@ControllerConfiguration(
+    dependents = {@Dependent(type = ConfigMapGenericKubernetesDependent.class)})
+public class GenericKubernetesDependentManagedReconciler
+    implements Reconciler<GenericKubernetesDependentManagedCustomResource> {
+
+  @Override
+  public UpdateControl<GenericKubernetesDependentManagedCustomResource> reconcile(
+      GenericKubernetesDependentManagedCustomResource resource,
+      Context<GenericKubernetesDependentManagedCustomResource> context) {
+
+    return UpdateControl.<GenericKubernetesDependentManagedCustomResource>noUpdate();
+  }
+
+}

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/generickubernetesdependentresourcemanaged/GenericKubernetesDependentManagedSpec.java

@@ -0,0 +1,15 @@
+package io.javaoperatorsdk.operator.sample.generickubernetesdependentresourcemanaged;
+
+public class GenericKubernetesDependentManagedSpec {
+
+  private String value;
+
+  public String getValue() {
+    return value;
+  }
+
+  public GenericKubernetesDependentManagedSpec setValue(String value) {
+    this.value = value;
+    return this;
+  }
+}

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/generickubernetesdependentstandalone/ConfigMapGenericKubernetesDependent.java

@@ -6,7 +6,7 @@
 
 import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
-import io.javaoperatorsdk.operator.api.reconciler.dependent.Deleter;
+import io.javaoperatorsdk.operator.api.reconciler.dependent.GarbageCollected;
 import io.javaoperatorsdk.operator.processing.GroupVersionKind;
 import io.javaoperatorsdk.operator.processing.dependent.Creator;
 import io.javaoperatorsdk.operator.processing.dependent.Updater;
@@ -17,7 +17,7 @@ public class ConfigMapGenericKubernetesDependent extends
     implements
     Creator<GenericKubernetesResource, GenericKubernetesDependentStandaloneCustomResource>,
     Updater<GenericKubernetesResource, GenericKubernetesDependentStandaloneCustomResource>,
-    Deleter<GenericKubernetesDependentStandaloneCustomResource> {
+    GarbageCollected<GenericKubernetesDependentStandaloneCustomResource> {
 
   public static final String VERSION = "v1";
   public static final String KIND = "ConfigMap";
@@ -32,7 +32,7 @@ protected GenericKubernetesResource desired(
       GenericKubernetesDependentStandaloneCustomResource primary,
       Context<GenericKubernetesDependentStandaloneCustomResource> context) {
 
-    try (InputStream is = this.getClass().getResourceAsStream("configmap.yaml")) {
+    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());

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/generickubernetesdependentstandalone/GenericKubernetesDependentStandaloneReconciler.java

@@ -22,7 +22,7 @@ public UpdateControl<GenericKubernetesDependentStandaloneCustomResource> reconci
 
     dependent.reconcile(resource, context);
 
-    return UpdateControl.noUpdate();
+    return UpdateControl.<GenericKubernetesDependentStandaloneCustomResource>noUpdate();
   }
 
   @Override