fix

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

Author: csviri

Diff for: src/main/java/io/javaoperatorsdk/operator/glue/reconciler/glue/GlueReconciler.java

@@ -101,10 +101,11 @@ public DeleteControl cleanup(Glue primary, Context<Glue> context) {
     var actualWorkflow = buildWorkflowAndRegisterInformers(primary, context);
     var result = actualWorkflow.cleanup(primary, context);
     result.throwAggregateExceptionIfErrorsPresent();
-
-    if (!result.allPostConditionsMet()) {
+    if (!result.allPostConditionsMet() && result.getDeleteCalledOnDependents()
+        .size() < actualWorkflow.getDependentResourcesByName().size()) {
       return DeleteControl.noFinalizerRemoval();
     } else {
+      log.debug("All cleanup post conditions met for glue: {} ", primary.getMetadata().getName());
       removeFinalizerForParent(primary, context);
       actualWorkflow.getDependentResourcesWithoutActivationCondition().forEach(dr -> {
         var genericDependentResource = (GenericDependentResource) dr;

Diff for: src/test/java/io/javaoperatorsdk/operator/glue/GlueTest.java

@@ -60,7 +60,7 @@ void simpleTemplating() {
 
     delete(glue);
 
-    await().timeout(Duration.ofSeconds(30)).untilAsserted(() -> {
+    await().timeout(GC_TIMEOUT).untilAsserted(() -> {
       var cm1 = get(ConfigMap.class, "templconfigmap1");
       var cm2 = get(ConfigMap.class, "templconfigmap2");
       assertThat(cm1).isNull();
@@ -99,7 +99,7 @@ void crossReferenceResource() {
 
     delete(glue);
 
-    await().untilAsserted(() -> {
+    await().timeout(GC_TIMEOUT).untilAsserted(() -> {
       var cm1 = get(ConfigMap.class, "cm-1");
       var cm2 = get(ConfigMap.class, "cm-2");
       assertThat(cm1).isNull();
@@ -136,7 +136,7 @@ void javaScriptCondition() {
 
     delete(glue);
 
-    await().timeout(Duration.ofSeconds(GC_TIMEOUT_SEC)).untilAsserted(() -> {
+    await().timeout(GC_TIMEOUT).untilAsserted(() -> {
       var cm1 = get(ConfigMap.class, "configmap1");
       var cm2 = get(ConfigMap.class, "configmap2");
       assertThat(cm1).isNull();
@@ -159,7 +159,7 @@ void stringTemplate() {
 
     delete(glue);
 
-    await().untilAsserted(() -> {
+    await().timeout(GC_TIMEOUT).untilAsserted(() -> {
       var cm1 = get(ConfigMap.class, "templconfigmap1");
       var cm2 = get(ConfigMap.class, "templconfigmap2");
       assertThat(cm1).isNull();
@@ -188,7 +188,7 @@ void simpleConcurrencyTest() {
     }));
 
     glueList.forEach(this::delete);
-    await().untilAsserted(() -> IntStream.range(0, num).forEach(index -> {
+    await().timeout(GC_TIMEOUT).untilAsserted(() -> IntStream.range(0, num).forEach(index -> {
       var w = get(Glue.class, "concurrencysample" + index);
       assertThat(w).isNull();
     }));
@@ -224,7 +224,7 @@ void changingWorkflow() {
     glue.getMetadata().setResourceVersion(null);
     delete(glue);
 
-    await().untilAsserted(() -> {
+    await().timeout(GC_TIMEOUT).untilAsserted(() -> {
       var cm1 = get(ConfigMap.class, "configmap1");
       var s = get(Secret.class, "secret1");
       assertThat(cm1).isNull();

Diff for: src/test/java/io/javaoperatorsdk/operator/glue/TestBase.java

@@ -24,7 +24,8 @@
 
 public class TestBase {
 
-  public static final int GC_TIMEOUT_SEC = 45;
+  public static final int GC_TIMEOUT_SEC = 120;
+  public static final Duration GC_TIMEOUT = Duration.ofSeconds(GC_TIMEOUT_SEC);
 
   @Inject
   protected KubernetesClient client;