From 6ef48079e620c70f3945d2c3221ece605cde3a45 Mon Sep 17 00:00:00 2001
From: Gianluca Mardente <gianluca.mardente@gmail.com>
Date: Thu, 11 Jun 2026 10:48:18 +0200
Subject: [PATCH] (bug) Deleting profiles

This PR fixes a bug in addon-controller where deleting ClusterProfiles got stuck
because `allMatchingProfilesProcessed` didn't skip other profiles already being
deleted.
---
 controllers/handlers_helm.go      |  6 ++++++
 controllers/handlers_helm_test.go | 35 +++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/controllers/handlers_helm.go b/controllers/handlers_helm.go
index ee2a49c4..8c42c56f 100644
--- a/controllers/handlers_helm.go
+++ b/controllers/handlers_helm.go
@@ -794,6 +794,9 @@ func isClusterProfileProcessed(ctx context.Context, c client.Client,
 	if cp.Name == ownerName || len(cp.Spec.HelmCharts) == 0 {
 		return true, nil
 	}
+	if cp.DeletionTimestamp != nil && !cp.DeletionTimestamp.IsZero() {
+		return true, nil
+	}
 	if hasDeletionTimestamp && cp.CreationTimestamp.After(deletionTime) {
 		return true, nil
 	}
@@ -822,6 +825,9 @@ func isProfileProcessed(ctx context.Context, c client.Client,
 	if p.Name == ownerName || len(p.Spec.HelmCharts) == 0 {
 		return true, nil
 	}
+	if p.DeletionTimestamp != nil && !p.DeletionTimestamp.IsZero() {
+		return true, nil
+	}
 	if hasDeletionTimestamp && p.CreationTimestamp.After(deletionTime) {
 		return true, nil
 	}
diff --git a/controllers/handlers_helm_test.go b/controllers/handlers_helm_test.go
index e0ee4c2a..8c00913a 100644
--- a/controllers/handlers_helm_test.go
+++ b/controllers/handlers_helm_test.go
@@ -2026,4 +2026,39 @@ var _ = Describe("allMatchingProfilesProcessed", func() {
 		Expect(err).To(BeNil())
 		Expect(processed).To(BeTrue())
 	})
+
+	It("returns true when a matching ClusterProfile is being deleted and its ClusterSummary is gone", func() {
+		s, err := setupScheme()
+		Expect(err).To(BeNil())
+
+		// cpB matches the cluster and has HelmCharts, but is being deleted — its
+		// ClusterSummary was already cleaned up as part of the deletion flow.
+		now := metav1.Now()
+		cpB := &configv1beta1.ClusterProfile{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:              randomString(),
+				DeletionTimestamp: &now,
+				Finalizers:        []string{"test-finalizer"},
+			},
+			Spec: configv1beta1.Spec{
+				ClusterSelector: libsveltosv1beta1.Selector{
+					LabelSelector: metav1.LabelSelector{
+						MatchLabels: map[string]string{testEnvLabelKey: testProductionValue},
+					},
+				},
+				HelmCharts: []configv1beta1.HelmChart{
+					{ReleaseName: randomString(), ReleaseNamespace: randomString(),
+						RepositoryURL: randomString(), ChartName: randomString(), ChartVersion: randomString()},
+				},
+			},
+		}
+
+		// no ClusterSummary for cpB — it was already deleted during profile cleanup
+		c := fake.NewClientBuilder().WithScheme(s).WithObjects(cluster, cpB).Build()
+
+		processed, err := controllers.AllMatchingProfilesProcessed(context.TODO(), c,
+			clusterSummary, textlogger.NewLogger(textlogger.NewConfig()))
+		Expect(err).To(BeNil())
+		Expect(processed).To(BeTrue())
+	})
 })