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

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

Browse Source 
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
parent 0a810ced54 478d12b4ff
commit 5f0ff026b0
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile-velero.alpine
+3 -3
View File
@@ -19,9 +19,9 @@ MAINTAINER Andy Goldstein <andy@heptio.com>
RUN apk add --no-cache ca-certificates
RUN apk add --update --no-cache bzip2 && \
wget --quiet https://github.com/restic/restic/releases/download/v0.9.3/restic_0.9.3_linux_amd64.bz2 && \
bunzip2 restic_0.9.3_linux_amd64.bz2 && \
mv restic_0.9.3_linux_amd64 /usr/bin/restic && \
wget --quiet https://github.com/restic/restic/releases/download/v0.9.4/restic_0.9.4_linux_amd64.bz2 && \
bunzip2 restic_0.9.4_linux_amd64.bz2 && \
mv restic_0.9.4_linux_amd64 /usr/bin/restic && \
chmod +x /usr/bin/restic
ADD /bin/linux/amd64/velero /velero
pkg/restic/command_factory.go
+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"),
}
}
pkg/restic/command_factory_test.go
+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)