wip

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

Author: csviri

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

@@ -110,14 +110,16 @@ public DeleteControl cleanup(Glue primary, Context<Glue> context) {
     var deletableResourceCount = actualWorkflow.getDependentResourcesByName()
         .entrySet().stream().filter(e -> e.getValue().isDeletable()).count();
 
+    // add this logic to josdk with deleted dependents
     if (!result.allPostConditionsMet() || result.getDeleteCalledOnDependents()
         .size() < deletableResourceCount) {
       return DeleteControl.noFinalizerRemoval();
     } else {
       removeFinalizerForParent(primary, context);
       actualWorkflow.getDependentResourcesWithoutActivationCondition().forEach(dr -> {
         var genericDependentResource = (GenericDependentResource) dr;
-        informerRegister.deRegisterInformer(genericDependentResource.getGroupVersionKind(),
+        informerRegister.deRegisterInformer(
+            toGVKIfGVKP(genericDependentResource.getGroupVersionKind()),
             primary, context);
       });
       informerRegister.deRegisterInformerForRelatedResources(primary, context);
@@ -201,12 +203,7 @@ private void createAndAddDependentToWorkflow(Glue primary, Context<Glue> context
     var name = genericTemplateHandler.processTemplate(Utils.getName(spec), primary, false, context);
     var dr = createDependentResource(name, spec, leafDependent, resourceInSameNamespaceAsPrimary,
         targetNamespace.orElse(null));
-    GroupVersionKind gvk = dr.getGroupVersionKind();
-    // remove when fixed in josdk
-    if (gvk instanceof GroupVersionKindPlural gvkp) {
-      gvk = new GroupVersionKind(gvkp.getGroup(), gvkp.getVersion(), gvkp.getKind());
-    }
-
+    GroupVersionKind gvk = toGVKIfGVKP(dr.getGroupVersionKind());
     var es = informerRegister.registerInformer(context, gvk, primary);
     dr.setEventSource(es);
 
@@ -374,4 +371,13 @@ public static boolean isGlueOfAGlueOperator(Glue glue) {
 
   }
 
+  // remove if the conversion not happens in josdk anymore
+  // https://github.com/operator-framework/java-operator-sdk/pull/2726
+  private static GroupVersionKind toGVKIfGVKP(GroupVersionKind gvk) {
+    if (gvk instanceof GroupVersionKindPlural gvkp) {
+      gvk = new GroupVersionKind(gvkp.getGroup(), gvkp.getVersion(), gvkp.getKind());
+    }
+    return gvk;
+  }
+
 }