fixes on deletion

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

Author: csviri

src/main/java/io/javaoperatorsdk/operator/glue/Utils.java

@@ -135,13 +135,6 @@ public static String getKindFromTemplate(String resourceTemplate) {
     return getPropertyValueFromTemplate(resourceTemplate, "kind");
   }
 
-  public static Set<String> leafResourceNames(Glue glue) {
-    Set<String> result = new HashSet<>();
-    glue.getSpec().getChildResources().forEach(r -> result.add(r.getName()));
-    glue.getSpec().getChildResources().forEach(r -> r.getDependsOn().forEach(result::remove));
-    return result;
-  }
-
   private static Optional<String> getOptionalPropertyValueFromTemplate(String resourceTemplate,
       String property) {
     var finalProp = property + ":";

src/main/java/io/javaoperatorsdk/operator/glue/reconciler/glue/GlueReconciler.java

@@ -176,20 +176,18 @@ private void cleanupRemovedResourcesFromWorkflow(Context<Glue> context,
   private io.javaoperatorsdk.operator.processing.dependent.workflow.Workflow<Glue> buildWorkflowAndRegisterInformers(
       Glue primary, Context<Glue> context) {
     var builder = new WorkflowBuilder<Glue>();
-    Set<String> leafDependentNames = Utils.leafResourceNames(primary);
 
     Map<String, GenericDependentResource> genericDependentResourceMap = new HashMap<>();
     primary.getSpec().getChildResources().forEach(spec -> createAndAddDependentToWorkflow(primary,
-        context, spec, genericDependentResourceMap, builder,
-        leafDependentNames.contains(spec.getName())));
+        context, spec, genericDependentResourceMap, builder));
 
     return builder.build();
   }
 
   private void createAndAddDependentToWorkflow(Glue primary, Context<Glue> context,
       DependentResourceSpec spec,
       Map<String, GenericDependentResource> genericDependentResourceMap,
-      WorkflowBuilder<Glue> builder, boolean leafDependent) {
+      WorkflowBuilder<Glue> builder) {
 
     // todo test processing ns not as template
     // todo test processing ns as template
@@ -203,7 +201,7 @@ private void createAndAddDependentToWorkflow(Glue primary, Context<Glue> context
     if (!Boolean.TRUE.equals(spec.getBulk())) {
       name = genericTemplateHandler.processTemplate(Utils.getName(spec), primary, false, context);
     }
-    var dr = createDependentResource(name, spec, leafDependent, resourceInSameNamespaceAsPrimary,
+    var dr = createDependentResource(name, spec, resourceInSameNamespaceAsPrimary,
         targetNamespace.orElse(null));
     GroupVersionKind gvk = toGVKIfGVKP(dr.getGroupVersionKind());
     var es = informerRegister.registerInformer(context, gvk, primary);
@@ -225,10 +223,10 @@ private void createAndAddDependentToWorkflow(Glue primary, Context<Glue> context
   }
 
   private GenericDependentResource createDependentResource(String resourceName,
-      DependentResourceSpec spec,
-      boolean leafDependent, Boolean resourceInSameNamespaceAsPrimary, String namespace) {
+      DependentResourceSpec spec, Boolean resourceInSameNamespaceAsPrimary, String namespace) {
 
-    if (leafDependent && resourceInSameNamespaceAsPrimary && !spec.isClusterScoped()) {
+    if (spec.getDependsOn().isEmpty() &&
+        resourceInSameNamespaceAsPrimary && !spec.isClusterScoped()) {
       return spec.getResourceTemplate() != null
           ? spec.getBulk()
               ? new GCGenericBulkDependentResource(genericTemplateHandler,