Skip to content
This repository has been archived by the owner on Mar 2, 2022. It is now read-only.

Commit

Permalink
Add changelog entry
Browse files Browse the repository at this point in the history
  • Loading branch information
cimnine committed May 27, 2021
1 parent fd8e651 commit d6ec0ed
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

## [v0.3.1] 2021-05-27
### Fixed
- Fix skipping backup of annotated pods ([#93])

## [v0.3.0] 2021-05-26
### Changed
- Refactor Integration tests ([#90])
Expand Down Expand Up @@ -162,7 +166,8 @@ compatibility with older operator versions. Changes to the design contain:
- Improved error detection and various bugfixes
- Timeout for initial snapshot listing, default: 30s

[Unreleased]: https://git.vshn.net/vshn/wrestic/compare/v0.3.0...master
[Unreleased]: https://github.com/vshn/wrestic/compare/v0.3.0...master
[v0.3.1]: https://github.com/vshn/wrestic/releases/tag/v0.3.1
[v0.3.0]: https://github.com/vshn/wrestic/releases/tag/v0.3.0
[v0.0.7]: https://git.vshn.net/vshn/wrestic/compare/v0.0.6...v0.0.7
[v0.0.6]: https://git.vshn.net/vshn/wrestic/compare/v0.0.5...v0.0.6
Expand All @@ -187,3 +192,4 @@ compatibility with older operator versions. Changes to the design contain:
[#89]: https://github.com/vshn/wrestic/pull/89
[#90]: https://github.com/vshn/wrestic/pull/90
[#92]: https://github.com/vshn/wrestic/pull/92
[#93]: https://github.com/vshn/wrestic/pull/93
12 changes: 6 additions & 6 deletions cmd/wrestic/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,26 +97,26 @@ func run(resticCLI *restic.Restic, mainLogger logr.Logger) error {
}
}

dontBackup := false
skipBackup := false

if *prune {
dontBackup = true
skipBackup = true
if err := resticCLI.Prune(tags); err != nil {
mainLogger.Error(err, "prune job failed")
return err
}
}

if *check {
dontBackup = true
skipBackup = true
if err := resticCLI.Check(); err != nil {
mainLogger.Error(err, "check job failed")
return err
}
}

if *restore {
dontBackup = true
skipBackup = true
if err := resticCLI.Restore(*restoreSnap, restic.RestoreOptions{
RestoreType: restic.RestoreType(*restoreType),
RestoreDir: os.Getenv(restic.RestoreDirEnv),
Expand All @@ -134,14 +134,14 @@ func run(resticCLI *restic.Restic, mainLogger logr.Logger) error {
}

if *archive {
dontBackup = true
skipBackup = true
if err := resticCLI.Archive(*restoreFilter, *verifyRestore, tags); err != nil {
mainLogger.Error(err, "archive job failed")
return err
}
}

if dontBackup {
if skipBackup {
return nil
}

Expand Down

0 comments on commit d6ec0ed

Please sign in to comment.