glue parent finalizer handling

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

Author: csviri

src/main/java/io/csviri/operator/resourceglue/reconciler/glue/GlueReconciler.java

@@ -18,6 +18,7 @@
 import io.csviri.operator.resourceglue.dependent.GenericResourceDiscriminator;
 import io.csviri.operator.resourceglue.templating.GenericTemplateHandler;
 import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
+import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.client.KubernetesClientException;
 import io.fabric8.kubernetes.client.dsl.base.PatchContext;
 import io.fabric8.kubernetes.client.dsl.base.PatchType;
@@ -51,6 +52,9 @@ public UpdateControl<Glue> reconcile(Glue primary,
     log.debug("Reconciling glue. name: {} namespace: {}",
         primary.getMetadata().getName(), primary.getMetadata().getNamespace());
     registerRelatedResourceInformers(context, primary);
+    if (deletedGlueIfParentMarkedForDeletion(context, primary)) {
+      return UpdateControl.noUpdate();
+    }
     addFinalizersToParentResource(primary, context);
     if (ownersBeingDeleted(primary, context)) {
       return UpdateControl.noUpdate();
@@ -63,6 +67,16 @@ public UpdateControl<Glue> reconcile(Glue primary,
     return UpdateControl.noUpdate();
   }
 
+  private boolean deletedGlueIfParentMarkedForDeletion(Context<Glue> context, Glue primary) {
+    var parent = getParentRelatedResource(primary, context);
+    if (parent.map(HasMetadata::isMarkedForDeletion).orElse(false)) {
+      context.getClient().resource(primary).delete();
+      return true;
+    } else {
+      return false;
+    }
+  }
+
 
   /**
    * If a parent gets deleted, the glue is reconciled still, but we don't want that in that case.
@@ -217,25 +231,14 @@ private Condition toCondition(ConditionSpec condition) {
 
   // todo docs
   private void addFinalizersToParentResource(Glue primary, Context<Glue> context) {
-    var parentRelated = primary.getSpec().getRelatedResources().stream()
-        .filter(r -> r.getName().equals(PARENT_RELATED_RESOURCE_NAME))
-        .findAny();
-    parentRelated.ifPresent(r -> {
-      var relatedResources = Utils.getRelatedResources(primary, r, context);
-      if (relatedResources.size() > 1) {
-        throw new IllegalStateException(
-            "parent related resource contains more resourceNames for glue name: "
-                + primary.getMetadata().getName()
-                + " namespace: " + primary.getMetadata().getNamespace());
-      }
-      // theoretically can happen that parent was deleted meanwhile
-      if (relatedResources.isEmpty()) {
-        return;
-      }
-      var parent = relatedResources.entrySet().iterator().next().getValue();
+    var parent = getParentRelatedResource(primary, context);
+
+    parent.ifPresent(p -> {
+      log.warn("Adding finalizer to parent. Glue name: {} namespace: {}",
+          primary.getMetadata().getName(), primary.getMetadata().getNamespace());
       String finalizer = parentFinalizer(primary.getMetadata().getName());
-      if (!parent.getMetadata().getFinalizers().contains(finalizer)) {
-        var res = getResourceForSSAFrom(parent);
+      if (!p.getMetadata().getFinalizers().contains(finalizer)) {
+        var res = getResourceForSSAFrom(p);
         res.getMetadata().getFinalizers().add(finalizer);
         context.getClient().resource(res)
             .patch(new PatchContext.Builder()
@@ -248,33 +251,43 @@ private void addFinalizersToParentResource(Glue primary, Context<Glue> context)
   }
 
   private void removeFinalizerForParent(Glue primary, Context<Glue> context) {
+    var parent = getParentRelatedResource(primary, context);
+    parent.ifPresentOrElse(p -> {
+      log.warn("Removing finalizer from parent. Glue name: {} namespace: {}",
+          primary.getMetadata().getName(), primary.getMetadata().getNamespace());
+      String finalizer = parentFinalizer(primary.getMetadata().getName());
+      if (p.getMetadata().getFinalizers().contains(finalizer)) {
+        var res = getResourceForSSAFrom(p);
+        context.getClient().resource(res)
+            .patch(new PatchContext.Builder()
+                .withFieldManager(context.getControllerConfiguration().fieldManager())
+                .withForce(true)
+                .withPatchType(PatchType.SERVER_SIDE_APPLY)
+                .build());
+      }
+    }, () -> log.warn(
+        "Parent resource expected to be present on cleanup. Glue name: {} namespace: {}",
+        primary.getMetadata().getName(), primary.getMetadata().getNamespace()));
+  }
+
+  private Optional<GenericKubernetesResource> getParentRelatedResource(Glue primary,
+      Context<Glue> context) {
     var parentRelated = primary.getSpec().getRelatedResources().stream()
         .filter(r -> r.getName().equals(PARENT_RELATED_RESOURCE_NAME))
         .findAny();
-    parentRelated.ifPresent(r -> {
+
+    return parentRelated.flatMap(r -> {
       var relatedResources = Utils.getRelatedResources(primary, r, context);
       if (relatedResources.size() > 1) {
         throw new IllegalStateException(
             "parent related resource contains more resourceNames for glue name: "
                 + primary.getMetadata().getName()
                 + " namespace: " + primary.getMetadata().getNamespace());
       }
-      // theoretically can happen that parent was deleted meanwhile
       if (relatedResources.isEmpty()) {
-        log.warn("Parent resource expected to be present on cleanup. Glue name: {} namespace: {}",
-            primary.getMetadata().getName(), primary.getMetadata().getNamespace());
-        return;
-      }
-      var parent = relatedResources.entrySet().iterator().next().getValue();
-      String finalizer = parentFinalizer(primary.getMetadata().getName());
-      if (parent.getMetadata().getFinalizers().contains(finalizer)) {
-        var res = getResourceForSSAFrom(parent);
-        context.getClient().resource(res)
-            .patch(new PatchContext.Builder()
-                .withFieldManager(context.getControllerConfiguration().fieldManager())
-                .withForce(true)
-                .withPatchType(PatchType.SERVER_SIDE_APPLY)
-                .build());
+        return Optional.empty();
+      } else {
+        return Optional.of(relatedResources.entrySet().iterator().next().getValue());
       }
     });
   }

src/main/java/io/csviri/operator/resourceglue/reconciler/glue/InformerRegister.java

@@ -24,7 +24,7 @@ class InformerRegister {
 
   private final Map<GroupVersionKind, Set<String>> gvkOfInformerToGlue = new HashMap<>();
   private final Map<String, Set<GroupVersionKind>> glueToInformerGVK = new HashMap<>();
-  private final Map<GroupVersionKind, RelatedResourceSecondaryToPrimaryMapper> relatedResourceMappers =
+  private final Map<GroupVersionKind, RelatedAndOwnedResourceSecondaryToPrimaryMapper> relatedResourceMappers =
       new ConcurrentHashMap<>();
 
   // todo test related resources deleting
@@ -71,9 +71,10 @@ public void registerInformerForRelatedResource(Context<Glue> context,
   public InformerEventSource<GenericKubernetesResource, Glue> registerInformer(
       Context<Glue> context, GroupVersionKind gvk, Glue glue) {
 
-    RelatedResourceSecondaryToPrimaryMapper mapper;
+    RelatedAndOwnedResourceSecondaryToPrimaryMapper mapper;
     synchronized (this) {
-      relatedResourceMappers.putIfAbsent(gvk, new RelatedResourceSecondaryToPrimaryMapper());
+      relatedResourceMappers.putIfAbsent(gvk,
+          new RelatedAndOwnedResourceSecondaryToPrimaryMapper());
       mapper = relatedResourceMappers.get(gvk);
       markEventSource(gvk, glue);
     }

src/main/java/io/csviri/operator/resourceglue/reconciler/glue/RelatedResourceSecondaryToPrimaryMapper.java renamed to src/main/java/io/csviri/operator/resourceglue/reconciler/glue/RelatedAndOwnedResourceSecondaryToPrimaryMapper.java

@@ -11,7 +11,7 @@
 import io.javaoperatorsdk.operator.processing.event.source.SecondaryToPrimaryMapper;
 import io.javaoperatorsdk.operator.processing.event.source.informer.Mappers;
 
-public class RelatedResourceSecondaryToPrimaryMapper
+public class RelatedAndOwnedResourceSecondaryToPrimaryMapper
     implements SecondaryToPrimaryMapper<GenericKubernetesResource> {
 
   private final Map<ResourceID, Set<ResourceID>> secondaryToPrimaryMap = new ConcurrentHashMap<>();