Skip to content

feat: only delete cluster if all other finalizers on cluster resource are gone #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maximiliantech merged 6 commits into from
Oct 31, 2025
Merged

feat: only delete cluster if all other finalizers on cluster resource are gone #85

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1b6c3a0
only delete cluster if all other finalizers on cluster resource are gone
Diaphteiros Oct 23, 2025
4314193
move foreign finalizer detection in helper method
Diaphteiros Oct 29, 2025
f58c2a3
add unit tests for helper function
Diaphteiros Oct 30, 2025
d6dc5df
refactor: identifyFinalizers to table driven test
maximiliantech Oct 30, 2025
8095ef7
chore: clean-up go.mod
maximiliantech Oct 30, 2025
ede8f2b
fix: remove comments
maximiliantech Oct 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion internal/controller/cluster_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,28 @@ func (r *ClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
}

func (r *ClusterReconciler) handleDelete(ctx context.Context, cluster *clustersv1alpha1.Cluster) (ctrl.Result, error) {
log := logf.FromContext(ctx)
requeue := smartrequeue.FromContext(ctx)
cluster.Status.Phase = commonapi.StatusPhaseTerminating

if !controllerutil.ContainsFinalizer(cluster, Finalizer) {
// check if there are any foreign finalizers on the Cluster resource
foreignFinalizers := make([]string, 0, len(cluster.Finalizers))
found := false
for _, fin := range cluster.Finalizers {
if fin != Finalizer {
foreignFinalizers = append(foreignFinalizers, fin)
} else {
found = true
}
}
if !found {
// Nothing to do
return ctrl.Result{}, nil
}
if len(foreignFinalizers) > 0 {
log.Info("Postponing cluster deletion until foreign finalizers are removed", "foreignFinalizers", foreignFinalizers)
return requeue.Progressing()
}

name := kindName(cluster)

Expand Down