Skip to content

Commit 8b39f73

Browse files
authored
improve: more strict delete condition (#2722)
1 parent fefc87a commit 8b39f73

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

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

+3-11
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,9 @@
44
import io.javaoperatorsdk.operator.api.reconciler.Context;
55
import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
66

7-
/**
8-
* A condition implementation meant to be used as a delete post-condition on Kubernetes dependent
7+
/* A condition implementation meant to be used as a delete post-condition on Kubernetes dependent
98
* resources to prevent the workflow from proceeding until the associated resource is actually
10-
* deleted from the server (or, at least, doesn't have any finalizers anymore). This is needed in
11-
* cases where a cleaning process depends on resources being actually removed from the server
12-
* because, by default, workflows simply request the deletion but do NOT wait for the resources to
13-
* be actually deleted.
9+
* deleted from the server.
1410
*/
1511
public class KubernetesResourceDeletedCondition implements Condition<HasMetadata, HasMetadata> {
1612

@@ -20,10 +16,6 @@ public boolean isMet(
2016
HasMetadata primary,
2117
Context<HasMetadata> context) {
2218
var optionalResource = dependentResource.getSecondaryResource(primary, context);
23-
if (optionalResource.isEmpty()) {
24-
return true;
25-
} else {
26-
return optionalResource.orElseThrow().getMetadata().getFinalizers().isEmpty();
27-
}
19+
return optionalResource.isEmpty();
2820
}
2921
}

0 commit comments

Comments
 (0)