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

Merge pull request #2576 from skriss/fix-2562

Browse Source 
bug fix: pass ca cert file to restic stats command on restore
This commit is contained in:
Nolan Brubaker
2020-05-26 15:16:28 -04:00
committed by GitHub
parent 5cc0b0bc6e 98c1a34558
commit 0effb5d74b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/restic/exec_commands.go
View File

@@ -185,7 +185,7 @@ func getSummaryLine(b []byte) ([]byte, error) {
// RunRestore runs a `restic restore` command and monitors the volume size to
// provide progress updates to the caller.
func RunRestore(restoreCmd *Command, log logrus.FieldLogger, updateFunc func(velerov1api.PodVolumeOperationProgress)) (string, string, error) {
snapshotSize, err := getSnapshotSize(restoreCmd.RepoIdentifier, restoreCmd.PasswordFile, restoreCmd.Args[0], restoreCmd.Env)
snapshotSize, err := getSnapshotSize(restoreCmd.RepoIdentifier, restoreCmd.PasswordFile, restoreCmd.CACertFile, restoreCmd.Args[0], restoreCmd.Env)
if err != nil {
return "", "", errors.Wrap(err, "error getting snapshot size")
}
@@ -231,9 +231,10 @@ func RunRestore(restoreCmd *Command, log logrus.FieldLogger, updateFunc func(vel
return stdout, stderr, err
}
func getSnapshotSize(repoIdentifier, passwordFile, snapshotID string, env []string) (int64, error) {
func getSnapshotSize(repoIdentifier, passwordFile, caCertFile, snapshotID string, env []string) (int64, error) {
cmd := StatsCommand(repoIdentifier, passwordFile, snapshotID)
cmd.Env = env
cmd.CACertFile = caCertFile
stdout, stderr, err := exec.RunCommand(cmd.Cmd())
if err != nil {