Gitopts reconciler just deletes the Bundle, not BundleDeployments (#2597

) As we are using finalizers for Bundles we can let the Bundle reconciler deal with its BundleDeployments and just delete the Bundle in the gitopts reconciler. That way we avoid having race conditions between both reconcilers trying to delete the same BundleDeployments Related to: #2586 Signed-off-by: Xavi Garcia <[email protected]>
rancher · Jul 5, 2024 · b761475 · b761475
1 parent 489d4c5
commit b761475
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/internal/cmd/controller/finalize/finalize.go b/internal/cmd/controller/finalize/finalize.go
@@ -50,11 +50,7 @@ func PurgeBundles(ctx context.Context, c client.Client, gitrepo types.Namespaced
 	}
 
 	for _, bundle := range bundles.Items {
-		nn := types.NamespacedName{Namespace: bundle.Namespace, Name: bundle.Name}
-		if err = PurgeBundleDeployments(ctx, c, nn); err != nil {
-			return client.IgnoreNotFound(err)
-		}
-
+		// Just delete the bundle and let the Bundle reconciler purge its BundleDeployments
 		err := c.Delete(ctx, &bundle)
 		if client.IgnoreNotFound(err) != nil {
 			return err