constructing workflow

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

Author: csviri

Diff for: operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/BaseConfigurationService.java

@@ -201,7 +201,8 @@ private static List<DependentResourceSpec> dependentResources(
           Utils.instantiate(dependent.reconcilePrecondition(), Condition.class, context),
           Utils.instantiate(dependent.deletePostcondition(), Condition.class, context),
           Utils.instantiate(dependent.activationCondition(), Condition.class, context),
-          eventSourceName);
+          eventSourceName, dependent.optional());
+
       specsMap.put(dependentName, spec);
     }
     return specsMap.values().stream().collect(Collectors.toUnmodifiableList());

Diff for: operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/dependent/DependentResourceSpec.java

@@ -26,10 +26,12 @@ public class DependentResourceSpec<R, P extends HasMetadata> {
 
   private final String useEventSourceWithName;
 
+  private final boolean optional;
+
   public DependentResourceSpec(Class<? extends DependentResource<R, P>> dependentResourceClass,
       String name, Set<String> dependsOn, Condition<?, ?> readyCondition,
       Condition<?, ?> reconcileCondition, Condition<?, ?> deletePostCondition,
-      Condition<?, ?> activationCondition, String useEventSourceWithName) {
+      Condition<?, ?> activationCondition, String useEventSourceWithName, boolean optional) {
     this.dependentResourceClass = dependentResourceClass;
     this.name = name;
     this.dependsOn = dependsOn;
@@ -38,6 +40,13 @@ public DependentResourceSpec(Class<? extends DependentResource<R, P>> dependentR
     this.deletePostCondition = deletePostCondition;
     this.activationCondition = activationCondition;
     this.useEventSourceWithName = useEventSourceWithName;
+    this.optional = optional;
+
+    if (this.optional && activationCondition != null) {
+      throw new IllegalArgumentException(
+          "Dependent resource cannot be both optional and contain activation condition. Dependent resource name: "
+              + name + " class: " + dependentResourceClass);
+    }
   }
 
   public Class<? extends DependentResource<R, P>> getDependentResourceClass() {
@@ -98,4 +107,8 @@ public Condition getActivationCondition() {
   public Optional<String> getUseEventSourceWithName() {
     return Optional.ofNullable(useEventSourceWithName);
   }
+
+  public boolean isOptional() {
+    return optional;
+  }
 }

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

@@ -20,7 +20,7 @@
 
 public class CRDPresentActivationCondition implements Condition<HasMetadata, HasMetadata> {
 
-  public static Retry DEFAULT_EXPIRATION_RETRY = new GenericRetry().setInitialInterval(1000)
+  public static Retry DEFAULT_EXPIRATION_RETRY = new GenericRetry().setInitialInterval(2000)
       .setMaxInterval(1000 * 60 * 60)
       .setIntervalMultiplier(2);
 

Diff for: operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/DefaultManagedWorkflow.java

@@ -78,14 +78,19 @@ public boolean isEmpty() {
   public Workflow<P> resolve(KubernetesClient client,
       ControllerConfiguration<P> configuration) {
     final var alreadyResolved = new HashMap<String, DependentResourceNode>(orderedSpecs.size());
+
+    // sharing the activation condition so no parallel requests are done for the same CRD
+    CRDPresentActivationCondition crdPresentActivationCondition =
+        new CRDPresentActivationCondition();
+
     for (DependentResourceSpec spec : orderedSpecs) {
       final var dependentResource = resolve(spec, client, configuration);
       final var node = new DependentResourceNode(
           spec.getReconcileCondition(),
           spec.getDeletePostCondition(),
           spec.getReadyCondition(),
-          spec.getActivationCondition(),
-          dependentResource);
+          spec.isOptional() ? crdPresentActivationCondition : spec.getActivationCondition(),
+          resolve(spec, client, configuration));
       alreadyResolved.put(dependentResource.name(), node);
       spec.getDependsOn()
           .forEach(depend -> node.addDependsOnRelation(alreadyResolved.get(depend)));

Diff for: operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/workflow/ManagedWorkflowTestUtils.java

@@ -21,7 +21,7 @@ public class ManagedWorkflowTestUtils {
   @SuppressWarnings("unchecked")
   public static DependentResourceSpec createDRS(String name, String... dependOns) {
     return new DependentResourceSpec(EmptyTestDependentResource.class, name, Set.of(dependOns),
-        null, null, null, null, null);
+        null, null, null, null, null, false);
   }
 
   public static DependentResourceSpec createDRSWithTraits(String name,