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

Commit

Permalink
Merge pull request #425 from fluxcd/bug/dry-run-rollback-reset
Browse files Browse the repository at this point in the history
  • Loading branch information
hiddeco authored May 21, 2020
2 parents 6f4b9c4 + 389bd47 commit 4601d9a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ due to anonymous index files not getting cleaned up in Helm 3.
### Bug fixes

- release: reset recorded failure cond on dry-run
[fluxcd/helm-operator#385][#385]
fluxcd/helm-operator{[#385][], [#425][]}
- release: imply release failure upon chart fetch
failure
[fluxcd/helm-operator#399][#399]
Expand Down Expand Up @@ -67,6 +67,7 @@ contributions to this release, feedback, and reporting issues.
[#411]: https://github.com/fluxcd/helm-operator/pull/411
[#421]: https://github.com/fluxcd/helm-operator/pull/421
[#422]: https://github.com/fluxcd/helm-operator/pull/422
[#425]: https://github.com/fluxcd/helm-operator/pull/425

## 1.0.1 (2020-04-15)

Expand Down
4 changes: 3 additions & 1 deletion pkg/release/release.go
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,9 @@ next:
action = UpgradeAction
goto next
}
status.SetStatusPhase(r.hrClient.HelmReleases(hr.Namespace), hr, v1.HelmReleasePhaseSucceeded)
if !status.HasRolledBack(hr) {
status.SetStatusPhase(r.hrClient.HelmReleases(hr.Namespace), hr, v1.HelmReleasePhaseSucceeded)
}
logger.Log("info", "no changes", "phase", action)
case InstallAction:
logger.Log("info", "running installation", "phase", action)
Expand Down

0 comments on commit 4601d9a

Please sign in to comment.