Skip to content

Commit

Permalink
Merge pull request #30 from vmware-tanzu/main
Browse files Browse the repository at this point in the history
Fork Sync: Update from parent repository
  • Loading branch information
github-actions[bot] authored Oct 27, 2022
2 parents cd1009b + 150570f commit 90b73d3
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 11 deletions.
1 change: 1 addition & 0 deletions changelogs/unreleased/5483-blackpiglet
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Remove redundancy code block left by #5388.
11 changes: 0 additions & 11 deletions pkg/controller/backup_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -663,17 +663,6 @@ func (c *backupController) runBackup(backup *pkgbackup.Request) error {
selector := label.NewSelectorForBackup(backup.Name)
vscList := &snapshotv1api.VolumeSnapshotContentList{}

if c.volumeSnapshotLister != nil {
tmpVSs, err := c.volumeSnapshotLister.List(selector)
if err != nil {
backupLog.Error(err)
}

for _, vs := range tmpVSs {
volumeSnapshots = append(volumeSnapshots, *vs)
}
}

volumeSnapshots, err = c.waitVolumeSnapshotReadyToUse(context.Background(), backup.Spec.CSISnapshotTimeout.Duration, backup.Name)
if err != nil {
backupLog.Errorf("fail to wait VolumeSnapshot change to Ready: %s", err.Error())
Expand Down

1 comment on commit 90b73d3

@vercel
Copy link

@vercel vercel bot commented on 90b73d3 Oct 27, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

velero – ./

velero-git-main-kaovilai.vercel.app
velero-kaovilai.vercel.app
velero.vercel.app
velero.tig.pw

Please sign in to comment.