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

Merge pull request #5145 from blackpiglet/5140-fix-restic-backup-with-customize-CA

Browse Source 
Delay CA file deletion in PVB controller
This commit is contained in:
qiuming
2022-07-26 10:32:59 +08:00
committed by GitHub
parent b5583bc2d9 82ac228a01
commit f68ae92fd0
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
changelogs/unreleased/5145-jxun Normal file
View File

@@ -0,0 +1 @@
Delay CA file deletion in PVB controller.

8
pkg/controller/pod_volume_backup_controller.go
View File

@@ -124,7 +124,11 @@ func (r *PodVolumeBackupReconciler) Reconcile(ctx context.Context, req ctrl.Requ
if err != nil {
return r.updateStatusToFailed(ctx, &pvb, err, "building Restic command", log)
}
defer os.Remove(resticDetails.credsFile)
defer func() {
os.Remove(resticDetails.credsFile)
os.Remove(resticDetails.caCertFile)
}()
backupLocation := &velerov1api.BackupStorageLocation{}
if err := r.Client.Get(context.Background(), client.ObjectKey{
@@ -344,8 +348,6 @@ func (r *PodVolumeBackupReconciler) buildResticCommand(ctx context.Context, log
if err != nil {
log.WithError(err).Error("creating temporary caCert file")
}
defer os.Remove(details.caCertFile)
}
cmd.CACertFile = details.caCertFile