Skip to content

OCPBUGS-1489: [vsphere] Loop over all folders for destroy #6378

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
openshift-merge-robot merged 1 commit into from
Sep 22, 2022
Merged

OCPBUGS-1489: [vsphere] Loop over all folders for destroy #6378

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 16 additions & 13 deletions pkg/destroy/vsphere/vsphere.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,21 +143,24 @@ func (o *ClusterUninstaller) deleteFolder() error {
}

// If there are no children in the folder, go ahead and remove it
if len(folderMoList[0].ChildEntity) == 0 {
folderLogger := o.Logger.WithField("Folder", folderMoList[0].Name)

folder := object.NewFolder(o.Client, folderMoList[0].Reference())
task, err := folder.Destroy(ctx)
if err == nil {
err = task.Wait(ctx)
}
if err != nil {
folderLogger.Debug(err)
return err
for _, f := range folderMoList {
if len(f.ChildEntity) == 0 {
folderLogger := o.Logger.WithField("Folder", f.Name)

folder := object.NewFolder(o.Client, f.Reference())
task, err := folder.Destroy(ctx)
if err == nil {
err = task.Wait(ctx)
}
if err != nil {
folderLogger.Debug(err)
return err
}
folderLogger.Info("Destroyed")
} else {
return errors.Errorf("Expected Folder %s to be empty", f.Name)
}
folderLogger.Info("Destroyed")
} else {
return errors.Errorf("Expected Folder %s to be empty", folderMoList[0].Name)
}

return nil
Expand Down