Merge remote-tracking branch 'helm/master'

Signed-off-by: Liu Ming <hit_oak_tree@126.com>
5 years ago · a1685b737d
parent 376a5ca550
commit a1685b737d
1 changed files with 2 additions and 3 deletions
--- a/pkg/action/rollback.go
+++ b/pkg/action/rollback.go
@ -210,10 +210,7 @@ func (r *Rollback) performRollback(currentRelease, targetRelease *release.Releas
 		}
 	}

-	targetRelease.Info.Status = release.StatusDeployed
-
 	deployed, err := r.cfg.Releases.DeployedAll(currentRelease.Name)
-
 	if err != nil && !strings.Contains(err.Error(), "has no deployed releases") {
 		return nil, err
 	}
@ -224,5 +221,7 @@ func (r *Rollback) performRollback(currentRelease, targetRelease *release.Releas
 		r.cfg.recordRelease(rel)
 	}

+	targetRelease.Info.Status = release.StatusDeployed
+
 	return targetRelease, nil
 }