Skip to content

Commit

Permalink
upgrade to restic v0.9.4 and replace --hostname with --host
Browse files Browse the repository at this point in the history
Signed-off-by: Steve Kriss <[email protected]>
  • Loading branch information
skriss committed Feb 5, 2019
1 parent 3054a38 commit 478d12b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions Dockerfile-velero.alpine
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ MAINTAINER Andy Goldstein <[email protected]>
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
Expand Down
4 changes: 2 additions & 2 deletions pkg/restic/command_factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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"),
}
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/restic/command_factory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 478d12b

Please sign in to comment.