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

@@ -11,6 +11,12 @@
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
 
+/**
+ * A generic CRD checking activation condition. Makes sure that the CRD is not checked unnecessarily
+ * even used in multiple condition. By default, it checks CRD at most 10 times with a delay at least
+ * 10 seconds. To fully customize CRD check trigger behavior you can extend this class and override
+ * the {@link CRDPresentActivationCondition#shouldCheckStateNow(CRDCheckState)} method.
+ **/
 public class CRDPresentActivationCondition<R extends HasMetadata, P extends HasMetadata>
     implements Condition<R, P> {
 
@@ -98,25 +104,13 @@ public Boolean isCrdPresent() {
       return crdPresent;
     }
 
-    public void setCrdPresent(boolean crdPresent) {
-      this.crdPresent = crdPresent;
-    }
-
     public LocalDateTime getLastChecked() {
       return lastChecked;
     }
 
-    public void setLastChecked(LocalDateTime lastChecked) {
-      this.lastChecked = lastChecked;
-    }
-
     public int getCheckCount() {
       return checkCount;
     }
-
-    public void setCheckCount(int checkCount) {
-      this.checkCount = checkCount;
-    }
   }
 
   public static class CRDPresentChecker {

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

@@ -0,0 +1,70 @@
+package io.javaoperatorsdk.operator;
+
+import java.time.Duration;
+import java.util.Map;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
+import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition;
+import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
+import io.javaoperatorsdk.operator.sample.crdpresentactivation.CRDPresentActivationCustomResource;
+import io.javaoperatorsdk.operator.sample.crdpresentactivation.CRDPresentActivationDependentCustomResource;
+import io.javaoperatorsdk.operator.sample.crdpresentactivation.CRDPresentActivationReconciler;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+
+public class CRDPresentActivationConditionIT {
+
+  public static final String TEST_1 = "test1";
+  public static final String CRD_NAME =
+      "crdpresentactivationdependentcustomresources.sample.javaoperatorsdk";
+
+  @RegisterExtension
+  LocallyRunOperatorExtension extension =
+      LocallyRunOperatorExtension.builder()
+          .withReconciler(new CRDPresentActivationReconciler())
+          .build();
+
+
+  @Test
+  void resourceCreatedOnlyIfCRDPresent() {
+    // deleted so test can be repeated
+    extension.getKubernetesClient().resources(CustomResourceDefinition.class)
+        .withName(CRD_NAME).delete();
+
+    var resource = extension.create(testResource());
+
+    await().pollDelay(Duration.ofMillis(300)).untilAsserted(() -> {
+      var crd = extension.getKubernetesClient().resources(CustomResourceDefinition.class)
+          .withName(CRD_NAME).get();
+      assertThat(crd).isNull();
+
+      var dr = extension.get(CRDPresentActivationDependentCustomResource.class, TEST_1);
+      assertThat(dr).isNull();
+    });
+
+    LocallyRunOperatorExtension.applyCrd(CRDPresentActivationDependentCustomResource.class,
+        extension.getKubernetesClient());
+
+    resource.getMetadata().setAnnotations(Map.of("sampple", "value"));
+    extension.replace(resource);
+
+    await().pollDelay(Duration.ofMillis(300)).untilAsserted(() -> {
+      var cm = extension.get(CRDPresentActivationDependentCustomResource.class, TEST_1);
+      assertThat(cm).isNull();
+    });
+
+  }
+
+  CRDPresentActivationCustomResource testResource() {
+    var res = new CRDPresentActivationCustomResource();
+    res.setMetadata(new ObjectMetaBuilder()
+        .withName(TEST_1)
+        .build());
+    return res;
+  }
+
+}

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/crdpresentactivation/CRDPresentActivationCustomResource.java

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

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/crdpresentactivation/CRDPresentActivationDependent.java

@@ -0,0 +1,28 @@
+package io.javaoperatorsdk.operator.sample.crdpresentactivation;
+
+import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
+import io.javaoperatorsdk.operator.api.reconciler.Context;
+import io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUDNoGCKubernetesDependentResource;
+
+public class CRDPresentActivationDependent
+    extends
+    CRUDNoGCKubernetesDependentResource<CRDPresentActivationDependentCustomResource, CRDPresentActivationCustomResource> {
+
+  public static final String DATA_KEY = "data";
+
+  public CRDPresentActivationDependent() {
+    super(CRDPresentActivationDependentCustomResource.class);
+  }
+
+  @Override
+  protected CRDPresentActivationDependentCustomResource desired(
+      CRDPresentActivationCustomResource primary,
+      Context<CRDPresentActivationCustomResource> context) {
+    var res = new CRDPresentActivationDependentCustomResource();
+    res.setMetadata(new ObjectMetaBuilder()
+        .withName(primary.getMetadata().getName())
+        .withNamespace(primary.getMetadata().getNamespace())
+        .build());
+    return res;
+  }
+}

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/crdpresentactivation/CRDPresentActivationDependentCustomResource.java

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

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/crdpresentactivation/CRDPresentActivationReconciler.java

@@ -0,0 +1,30 @@
+package io.javaoperatorsdk.operator.sample.crdpresentactivation;
+
+import io.javaoperatorsdk.operator.api.reconciler.*;
+import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
+import io.javaoperatorsdk.operator.processing.dependent.workflow.CRDPresentActivationCondition;
+
+@Workflow(dependents = {
+    @Dependent(type = CRDPresentActivationDependent.class,
+        activationCondition = CRDPresentActivationCondition.class),
+})
+// to trigger reconciliation with metadata change
+@ControllerConfiguration(generationAwareEventProcessing = false)
+public class CRDPresentActivationReconciler
+    implements Reconciler<CRDPresentActivationCustomResource>,
+    Cleaner<CRDPresentActivationCustomResource> {
+
+  @Override
+  public UpdateControl<CRDPresentActivationCustomResource> reconcile(
+      CRDPresentActivationCustomResource resource,
+      Context<CRDPresentActivationCustomResource> context) {
+
+    return UpdateControl.noUpdate();
+  }
+
+  @Override
+  public DeleteControl cleanup(CRDPresentActivationCustomResource resource,
+      Context<CRDPresentActivationCustomResource> context) {
+    return DeleteControl.defaultDelete();
+  }
+}