vmware-tanzu
/
velero
mirror of https://github.com/vmware-tanzu/velero.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #5150 from blackpiglet/cherry-pick-5145-to-1.9 

[cherry-pick] Delay CA file deletion in PVB controller
pull/5173/head
Shubham Pampattiwar 2022-07-26 11:05:13 -04:00 committed by GitHub
parent e76b697b45 4d20c5a112
commit b870847375
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelogs/unreleased/5150-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 { if err != nil {
return r.updateStatusToFailed(ctx, &pvb, err, "building Restic command", log) 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{} backupLocation := &velerov1api.BackupStorageLocation{}
if err := r.Client.Get(context.Background(), client.ObjectKey{ if err := r.Client.Get(context.Background(), client.ObjectKey{
@ -344,8 +348,6 @@ func (r *PodVolumeBackupReconciler) buildResticCommand(ctx context.Context, log
if err != nil { if err != nil {
log.WithError(err).Error("creating temporary caCert file") log.WithError(err).Error("creating temporary caCert file")
} }
defer os.Remove(details.caCertFile)
} }
cmd.CACertFile = details.caCertFile cmd.CACertFile = details.caCertFile