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

Delete the unneeded pvRestorer action in

Browse Source 
handleSkippedPVHasRetainPolicy

According to comment, calling executePVAction aims to reset PV's
claimRef, but the reset logic was moved into resetVolumeBindingInfo
since release-1.4.

Signed-off-by: Xun Jiang <blackpigletbruce@gmail.com>
This commit is contained in:
Xun Jiang
2024-03-26 14:41:27 +08:00
parent b06d7a467f
commit 5462035469
8 changed files with 251 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
pkg/controller/backup_finalizer_controller.go
View File

@@ -18,9 +18,7 @@ package controller
import (
"bytes"
"compress/gzip"
"context"
"encoding/json"
"os"
"github.com/pkg/errors"
@@ -31,7 +29,6 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
kbclient "sigs.k8s.io/controller-runtime/pkg/client"
"github.com/vmware-tanzu/velero/internal/volume"
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
pkgbackup "github.com/vmware-tanzu/velero/pkg/backup"
"github.com/vmware-tanzu/velero/pkg/itemoperation"
@@ -157,14 +154,7 @@ func (r *backupFinalizerReconciler) Reconcile(ctx context.Context, req ctrl.Requ
SkippedPVTracker: pkgbackup.NewSkipPVTracker(),
}
var outBackupFile *os.File
var volumeInfos []*volume.VolumeInfo
if len(operations) > 0 {
volumeInfos, err = backupStore.GetBackupVolumeInfos(backup.Name)
if err != nil {
log.WithError(err).Error("error getting backup VolumeInfos")
return ctrl.Result{}, errors.WithStack(err)
}
log.Info("Setting up finalized backup temp file")
inBackupFile, err := downloadToTempFile(backup.Name, backupStore, log)
if err != nil {
@@ -194,7 +184,6 @@ func (r *backupFinalizerReconciler) Reconcile(ctx context.Context, req ctrl.Requ
outBackupFile,
backupItemActionsResolver,
operations,
volumeInfos,
)
if err != nil {
log.WithError(err).Error("error finalizing Backup")
@@ -232,24 +221,6 @@ func (r *backupFinalizerReconciler) Reconcile(ctx context.Context, req ctrl.Requ
if err != nil {
return ctrl.Result{}, errors.Wrap(err, "error uploading backup final contents")
}
// Update the backup's VolumeInfos
backupVolumeInfoBuf := new(bytes.Buffer)
gzw := gzip.NewWriter(backupVolumeInfoBuf)
defer gzw.Close()
if err := json.NewEncoder(gzw).Encode(volumeInfos); err != nil {
return ctrl.Result{}, errors.Wrap(err, "error encoding restore results to JSON")
}
if err := gzw.Close(); err != nil {
return ctrl.Result{}, errors.Wrap(err, "error closing gzip writer")
}
err = backupStore.PutBackupVolumeInfos(backup.Name, backupVolumeInfoBuf)
if err != nil {
return ctrl.Result{}, errors.Wrap(err, "fail to upload backup VolumeInfos")
}
}
return ctrl.Result{}, nil
}