From cca68288063d235a4c32ef1ba822dd487317c8dc Mon Sep 17 00:00:00 2001 From: liuming216448 Date: Fri, 13 Mar 2020 18:36:19 +0800 Subject: [PATCH] fix: allow to rollback to previous version even if no deployed releases(#6978) Signed-off-by: liuming --- pkg/action/rollback.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/action/rollback.go b/pkg/action/rollback.go index 942c9d8af..0e09f8b6f 100644 --- a/pkg/action/rollback.go +++ b/pkg/action/rollback.go @@ -210,8 +210,14 @@ func (r *Rollback) performRollback(currentRelease, targetRelease *release.Releas } } + targetRelease.Info.Status = release.StatusDeployed + deployed, err := r.cfg.Releases.DeployedAll(currentRelease.Name) if err != nil { + if strings.Contains(err.Error(), "has no deployed releases") { + r.cfg.Log(err.Error()) + return targetRelease, nil + } return nil, err } // Supersede all previous deployments, see issue #2941. @@ -221,7 +227,5 @@ func (r *Rollback) performRollback(currentRelease, targetRelease *release.Releas r.cfg.recordRelease(rel) } - targetRelease.Info.Status = release.StatusDeployed - return targetRelease, nil }