changed to client.DeleteAllOf

hashicorp · Feb 12, 2025 · 688e364 · 688e364
1 parent c7bd671
commit 688e364
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/controllers/hcpvaultsecretsapp_controller.go b/controllers/hcpvaultsecretsapp_controller.go
@@ -478,6 +478,11 @@ func (r *HCPVaultSecretsAppReconciler) handleDeletion(ctx context.Context, o *se
 		return fmt.Errorf("failed to list secrets in namespace %s: %w", o.GetNamespace(), err)
 	}
 	removeFinalizers(ctx, r.Client, logger, &secrets)
+	if err := r.Client.DeleteAllOf(ctx, &secretsv1beta1.VaultDynamicSecret{},
+		client.InNamespace(common.OperatorNamespace),
+		client.MatchingLabels{helpers.LabelOwnerRefUID: string(o.GetUID())}); err != nil {
+		return fmt.Errorf("failed to delete secrets in namespace %s: %w", o.GetNamespace(), err)
+	}
 	// then remove the finalizer from the HCPVaultSecretsApp and delete it
 	if controllerutil.ContainsFinalizer(o, hcpVaultSecretsAppFinalizer) {
 		logger.Info("Removing finalizer")
@@ -489,6 +494,9 @@ func (r *HCPVaultSecretsAppReconciler) handleDeletion(ctx context.Context, o *se
 			logger.Info("Successfully removed the finalizer")
 		}
 	}
+	if err := r.Delete(ctx, o); err != nil {
+		return fmt.Errorf("failed to delete HCPVaultSecretsApp %s: %w", o.Spec.AppName, err)
+	}
 	return nil
 }