integration test

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

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/CRDPresentActivationCondition.java

@@ -52,7 +52,7 @@ public boolean isMet(DependentResource<HasMetadata, HasMetadata> dependentResour
       crdInformer = (InformerEventSource<CustomResourceDefinition, HasMetadata>) context
           .eventSourceRetriever().getResourceEventSourceFor(CustomResourceDefinition.class);
     } catch (IllegalArgumentException e) {
-      log.debug("Error when finding event source for CustomResourceDefinitions", e);
+      log.trace("Error when finding event source for CustomResourceDefinitions", e);
     }
 
     if (crdInformer != null) {

operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/LocallyRunOperatorExtension.java

@@ -1,6 +1,7 @@
 package io.javaoperatorsdk.operator.junit;
 
 import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
@@ -19,9 +20,11 @@
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.Namespaced;
+import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition;
 import io.fabric8.kubernetes.client.CustomResource;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.LocalPortForward;
+import io.fabric8.kubernetes.client.dsl.NonDeletingOperation;
 import io.javaoperatorsdk.operator.Operator;
 import io.javaoperatorsdk.operator.ReconcilerUtils;
 import io.javaoperatorsdk.operator.RegisteredController;
@@ -173,23 +176,46 @@ public static void applyCrd(Class<? extends HasMetadata> resourceClass, Kubernet
     applyCrd(ReconcilerUtils.getResourceTypeName(resourceClass), client);
   }
 
-  public static void applyCrd(String resourceTypeName, KubernetesClient client) {
+  public static void deleteCrd(Class<? extends HasMetadata> resourceClass,
+      KubernetesClient client) {
+    try {
+      var crd = loadCRD(ReconcilerUtils.getResourceTypeName(resourceClass), client);
+      client.resource(crd).delete();
+
+      Thread.sleep(CRD_READY_WAIT);
+    } catch (InterruptedException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+
+  private static CustomResourceDefinition loadCRD(String resourceTypeName,
+      KubernetesClient client) {
     String path = "/META-INF/fabric8/" + resourceTypeName + "-v1.yml";
     try (InputStream is = LocallyRunOperatorExtension.class.getResourceAsStream(path)) {
       if (is == null) {
         throw new IllegalStateException("Cannot find CRD at " + path);
       }
       var crdString = new String(is.readAllBytes(), StandardCharsets.UTF_8);
       LOGGER.debug("Applying CRD: {}", crdString);
-      final var crd = client.load(new ByteArrayInputStream(crdString.getBytes()));
-      crd.createOrReplace();
+      final var resources = client.load(new ByteArrayInputStream(crdString.getBytes()));
+      return (CustomResourceDefinition) resources.items().get(0);
+    } catch (IOException e) {
+      throw new IllegalStateException(e);
+    }
+  }
+
+  public static void applyCrd(String resourceTypeName, KubernetesClient client) {
+    try {
+      var crd = loadCRD(resourceTypeName, client);
+      client.resource(crd).createOr(NonDeletingOperation::update);
       Thread.sleep(CRD_READY_WAIT); // readiness is not applicable for CRD, just wait a little
-      LOGGER.debug("Applied CRD with path: {}", path);
+      LOGGER.debug("Applied CRD for type {}", resourceTypeName);
     } catch (InterruptedException ex) {
       LOGGER.error("Interrupted.", ex);
       Thread.currentThread().interrupt();
     } catch (Exception ex) {
-      throw new IllegalStateException("Cannot apply CRD yaml: " + path, ex);
+      throw new IllegalStateException("Cannot apply CRD for type: " + resourceTypeName, ex);
     }
   }
 

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

@@ -0,0 +1,63 @@
+package io.javaoperatorsdk.operator;
+
+import java.time.Duration;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+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.optionaldependent.OptionalDependentCustomResource;
+import io.javaoperatorsdk.operator.sample.optionaldependent.OptionalDependentReconciler;
+import io.javaoperatorsdk.operator.sample.optionaldependent.OptionalDependentSecondaryCustomResource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+
+public class OptionalDependentIT {
+
+  @RegisterExtension
+  LocallyRunOperatorExtension extension =
+      LocallyRunOperatorExtension.builder().withReconciler(new OptionalDependentReconciler())
+          .build();
+
+  @AfterEach
+  void cleanup() {
+    LocallyRunOperatorExtension.deleteCrd(OptionalDependentSecondaryCustomResource.class,
+        extension.getKubernetesClient());
+  }
+
+  @Test
+  void activatesResourceAfterCRDApplied() {
+    var r = extension.create(testResource());
+
+    await().pollDelay(Duration.ofMillis(200)).untilAsserted(() -> {
+      var secondary =
+          extension.get(OptionalDependentSecondaryCustomResource.class, r.getMetadata().getName());
+      assertThat(secondary).isNull();
+    });
+    LocallyRunOperatorExtension.applyCrd(OptionalDependentSecondaryCustomResource.class,
+        extension.getKubernetesClient());
+
+    // triggering reconciliation explicitly
+    r.getMetadata().getAnnotations().put("trigger", "true");
+    extension.replace(r);
+
+    await().untilAsserted(() -> {
+      var secondary =
+          extension.get(OptionalDependentSecondaryCustomResource.class, r.getMetadata().getName());
+      assertThat(secondary).isNotNull();
+    });
+  }
+
+  private OptionalDependentCustomResource testResource() {
+    var res = new OptionalDependentCustomResource();
+    res.setMetadata(new ObjectMetaBuilder()
+        .withName("test1")
+        .build());
+    return res;
+  }
+
+}
+

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/optionaldependent/OptionalDependent.java

@@ -0,0 +1,27 @@
+package io.javaoperatorsdk.operator.sample.optionaldependent;
+
+import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
+import io.javaoperatorsdk.operator.api.reconciler.Context;
+import io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUDKubernetesDependentResource;
+import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent;
+
+@KubernetesDependent
+public class OptionalDependent extends
+    CRUDKubernetesDependentResource<OptionalDependentSecondaryCustomResource, OptionalDependentCustomResource> {
+
+  public OptionalDependent() {
+    super(OptionalDependentSecondaryCustomResource.class);
+  }
+
+  @Override
+  protected OptionalDependentSecondaryCustomResource desired(
+      OptionalDependentCustomResource primary,
+      Context<OptionalDependentCustomResource> context) {
+    var res = new OptionalDependentSecondaryCustomResource();
+    res.setMetadata(new ObjectMetaBuilder()
+        .withName(primary.getMetadata().getName())
+        .withNamespace(primary.getMetadata().getNamespace())
+        .build());
+    return res;
+  }
+}

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/optionaldependent/OptionalDependentCustomResource.java

@@ -0,0 +1,15 @@
+package io.javaoperatorsdk.operator.sample.optionaldependent;
+
+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("od")
+public class OptionalDependentCustomResource
+    extends CustomResource<Void, Void>
+    implements Namespaced {
+}

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/optionaldependent/OptionalDependentReconciler.java

@@ -0,0 +1,24 @@
+package io.javaoperatorsdk.operator.sample.optionaldependent;
+
+import io.javaoperatorsdk.operator.api.reconciler.*;
+import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
+
+@ControllerConfiguration(
+
+    generationAwareEventProcessing = false, // to easily trigger reconciliation with metadata update
+    namespaces = Constants.WATCH_CURRENT_NAMESPACE,
+    dependents = {
+        @Dependent(type = OptionalDependent.class, optional = true),
+    })
+public class OptionalDependentReconciler
+    implements Reconciler<OptionalDependentCustomResource> {
+
+  @Override
+  public UpdateControl<OptionalDependentCustomResource> reconcile(
+      OptionalDependentCustomResource resource,
+      Context<OptionalDependentCustomResource> context) {
+    return UpdateControl.noUpdate();
+  }
+
+
+}

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/optionaldependent/OptionalDependentSecondaryCustomResource.java

@@ -0,0 +1,15 @@
+package io.javaoperatorsdk.operator.sample.optionaldependent;
+
+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("ods")
+public class OptionalDependentSecondaryCustomResource
+    extends CustomResource<Void, Void>
+    implements Namespaced {
+}