Merge pull request #425 from fluxcd/bug/dry-run-rollback-reset

fluxcd · May 21, 2020 · 4601d9a · 4601d9a
2 parents 6f4b9c4 + 389bd47
commit 4601d9a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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]
@@ -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)
 

diff --git a/pkg/release/release.go b/pkg/release/release.go
@@ -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)