Merge pull request #1156 from skriss/restic-v0.9.4

upgrade to restic v0.9.4 and replace --hostname with --host
This commit is contained in:
Nolan Brubaker
2019-02-06 14:03:44 -05:00
committed by GitHub
3 changed files with 6 additions and 6 deletions
+2 -2
View File
@@ -23,7 +23,7 @@ import (
// BackupCommand returns a Command for running a restic backup.
func BackupCommand(repoIdentifier, passwordFile, path string, tags map[string]string) *Command {
// --hostname flag is provided with a generic value because restic uses the hostname
// --host flag is provided with a generic value because restic uses the host
// to find a parent snapshot, and by default it will be the name of the daemonset pod
// where the `restic backup` command is run. If this pod is recreated, we want to continue
// taking incremental backups rather than triggering a full one due to a new pod name.
@@ -34,7 +34,7 @@ func BackupCommand(repoIdentifier, passwordFile, path string, tags map[string]st
PasswordFile: passwordFile,
Dir: path,
Args: []string{"."},
ExtraFlags: append(backupTagFlags(tags), "--hostname=velero"),
ExtraFlags: append(backupTagFlags(tags), "--host=velero"),
}
}
+1 -1
View File
@@ -32,7 +32,7 @@ func TestBackupCommand(t *testing.T) {
assert.Equal(t, "path", c.Dir)
assert.Equal(t, []string{"."}, c.Args)
expected := []string{"--tag=foo=bar", "--tag=c=d", "--hostname=velero"}
expected := []string{"--tag=foo=bar", "--tag=c=d", "--host=velero"}
sort.Strings(expected)
sort.Strings(c.ExtraFlags)
assert.Equal(t, expected, c.ExtraFlags)