Skip to content

Commit 6873084

Browse files
authored
fix: owner check redundant (#51)
Signed-off-by: csviri <[email protected]>
1 parent 2c5102a commit 6873084

File tree

1 file changed

+0
-33
lines changed

1 file changed

+0
-33
lines changed

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

-33
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,9 @@
2323
import io.fabric8.kubernetes.client.dsl.base.PatchContext;
2424
import io.fabric8.kubernetes.client.dsl.base.PatchType;
2525
import io.javaoperatorsdk.operator.api.reconciler.*;
26-
import io.javaoperatorsdk.operator.processing.GroupVersionKind;
2726
import io.javaoperatorsdk.operator.processing.dependent.workflow.Condition;
2827
import io.javaoperatorsdk.operator.processing.dependent.workflow.KubernetesResourceDeletedCondition;
2928
import io.javaoperatorsdk.operator.processing.dependent.workflow.WorkflowBuilder;
30-
import io.javaoperatorsdk.operator.processing.event.ResourceID;
31-
import io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource;
3229

3330
import static io.csviri.operator.resourceglue.Utils.getResourceForSSAFrom;
3431
import static io.csviri.operator.resourceglue.reconciler.operator.GlueOperatorReconciler.PARENT_RELATED_RESOURCE_NAME;
@@ -65,9 +62,6 @@ public UpdateControl<Glue> reconcile(Glue primary,
6562
return UpdateControl.noUpdate();
6663
}
6764
addFinalizersToParentResource(primary, context);
68-
if (ownersBeingDeleted(primary, context)) {
69-
return UpdateControl.noUpdate();
70-
}
7165
var actualWorkflow = buildWorkflowAndRegisterInformers(primary, context);
7266
var result = actualWorkflow.reconcile(primary, context);
7367
cleanupRemovedResourcesFromWorkflow(context, primary);
@@ -86,33 +80,6 @@ private boolean deletedGlueIfParentMarkedForDeletion(Context<Glue> context, Glue
8680
}
8781
}
8882

89-
90-
/**
91-
* If a parent gets deleted, the glue is reconciled still, but we don't want that in that case.
92-
* Glue us deleted / marked for deleted eventually by the garbage collector but want to make the
93-
* best effort to prevent that.
94-
*/
95-
private boolean ownersBeingDeleted(Glue primary, Context<Glue> context) {
96-
if (primary.getMetadata().getOwnerReferences().isEmpty()) {
97-
return false;
98-
}
99-
100-
var res = !primary.getMetadata().getOwnerReferences().stream().anyMatch(or -> {
101-
var gvk = new GroupVersionKind(or.getApiVersion(), or.getKind());
102-
var es = (InformerEventSource<GenericKubernetesResource, Glue>) context.eventSourceRetriever()
103-
.getResourceEventSourceFor(GenericKubernetesResource.class, gvk.toString());
104-
var resource = es.get(new ResourceID(or.getName(), primary.getMetadata().getNamespace()));
105-
return resource.map(r -> r.getMetadata().getDeletionTimestamp() == null).orElse(false);
106-
107-
});
108-
if (res) {
109-
log.debug("Skipping reconciliation since glue owners being deleted, name: {} namespace: {}",
110-
primary.getMetadata().getName(),
111-
primary.getMetadata().getNamespace());
112-
}
113-
return res;
114-
}
115-
11683
@Override
11784
public DeleteControl cleanup(Glue primary, Context<Glue> context) {
11885

0 commit comments

Comments
 (0)