mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-08-15 11:46:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix velero uninstall bug (#6720)

Browse Source 
Signed-off-by: Ming <mqiu@vmware.com>
This commit is contained in:
qiuming
2023-08-30 17:54:30 +08:00
committed by GitHub
parent ed256d74dd
commit 53530130a5
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cmd/cli/uninstall/uninstall.go
+4 -6
View File
@@ -280,7 +280,7 @@ func deleteResources(ctx context.Context, kbClient kbclient.Client, namespace st
if err == wait.ErrWaitTimeout {
err = forcedlyDeleteResources(ctx, kbClient, namespace)
if err != nil {
return errors.Wrap(err, "Error deleting restores")
return errors.Wrap(err, "Error deleting resources forcedly")
}
}
@@ -315,9 +315,7 @@ func gracefullyDeleteResources(ctx context.Context, kbClient kbclient.Client, na
}
func gracefullyDeleteResource(ctx context.Context, kbClient kbclient.Client, namespace string, list kbclient.ObjectList) error {
var err error
if err = kbClient.List(ctx, list, &kbclient.ListOptions{Namespace: namespace}); err != nil {
if err := kbClient.List(ctx, list, &kbclient.ListOptions{Namespace: namespace}); err != nil {
return errors.Wrap(err, "Error getting resources during graceful deletion")
}
@@ -341,14 +339,14 @@ func gracefullyDeleteResource(ctx context.Context, kbClient kbclient.Client, nam
// Delete collected resources in a batch
for _, resource := range objectsToDelete {
if err = kbClient.Delete(ctx, resource); err != nil {
if err := kbClient.Delete(ctx, resource); err != nil {
if apierrors.IsNotFound(err) {
continue
}
return errors.Wrap(err, "Error deleting resources during graceful deletion")
}
}
return err
return nil
}
func waitDeletingResources(ctx context.Context, kbClient kbclient.Client, namespace string) error {