improve: remove cleanup condition (#70)

Signed-off-by: Attila Mészáros <csviri@gmail.com>
csviri · Apr 9, 2024 · 4aa63b1 · 4aa63b1
1 parent 041a88f
commit 4aa63b1
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 19 deletions.
diff --git a/src/main/java/io/csviri/operator/resourceglue/customresource/glue/DependentResourceSpec.java b/src/main/java/io/csviri/operator/resourceglue/customresource/glue/DependentResourceSpec.java
@@ -27,9 +27,6 @@ public class DependentResourceSpec {
   @PreserveUnknownFields
   private ConditionSpec condition;
 
-  @PreserveUnknownFields
-  private ConditionSpec deletePostCondition;
-
   public String getName() {
     return name;
   }
@@ -76,15 +73,6 @@ public DependentResourceSpec setCondition(ConditionSpec conditionSpec) {
     return this;
   }
 
-  public ConditionSpec getDeletePostCondition() {
-    return deletePostCondition;
-  }
-
-  public DependentResourceSpec setDeletePostCondition(ConditionSpec deletePostConditionSpec) {
-    this.deletePostCondition = deletePostConditionSpec;
-    return this;
-  }
-
   public String getResourceTemplate() {
     return resourceTemplate;
   }
@@ -105,13 +93,11 @@ public boolean equals(Object o) {
         && Objects.equals(resourceTemplate, that.resourceTemplate)
         && Objects.equals(resource, that.resource) && Objects.equals(dependsOn, that.dependsOn)
         && Objects.equals(readyPostCondition, that.readyPostCondition)
-        && Objects.equals(condition, that.condition)
-        && Objects.equals(deletePostCondition, that.deletePostCondition);
+        && Objects.equals(condition, that.condition);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(name, resourceTemplate, resource, dependsOn, readyPostCondition, condition,
-        deletePostCondition);
+    return Objects.hash(name, resourceTemplate, resource, dependsOn, readyPostCondition, condition);
   }
 }
diff --git a/src/main/java/io/csviri/operator/resourceglue/reconciler/glue/GlueReconciler.java b/src/main/java/io/csviri/operator/resourceglue/reconciler/glue/GlueReconciler.java
@@ -179,8 +179,6 @@ private void createAndAddDependentToWorkflow(Glue primary, Context<Glue> context
         .ifPresent(c -> builder.withReadyPostcondition(toCondition(c)));
     Optional.ofNullable(spec.getCondition())
         .ifPresent(c -> builder.withReconcilePrecondition(toCondition(c)));
-    Optional.ofNullable(spec.getDeletePostCondition())
-        .ifPresent(c -> builder.withDeletePostcondition(toCondition(c)));
   }
 
   private static GenericDependentResource createDependentResource(DependentResourceSpec spec,

diff --git a/src/test/resources/sample/webpage/webpage.operator.yaml b/src/test/resources/sample/webpage/webpage.operator.yaml
@@ -7,7 +7,6 @@ spec:
     apiVersion: resourceglueoperator.sample/v1
     kind: WebPage
   resources:
-#    todo add to docs that name must be a valid javascript variable name if used in js condition
     - name: htmlconfigmap
       resource:
         apiVersion: v1