Merge remote-tracking branch 'helm/master'

Signed-off-by: Liu Ming <hit_oak_tree@126.com>
Signed-off-by: Matheus Hunsche <matheus.hunsche@ifood.com.br>
pull/8840/head
Liu Ming 6 years ago committed by Matheus Hunsche
parent 913f495488
commit 24e3fc9c3b

@ -210,8 +210,6 @@ 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
@ -223,5 +221,7 @@ func (r *Rollback) performRollback(currentRelease, targetRelease *release.Releas
r.cfg.recordRelease(rel)
}
targetRelease.Info.Status = release.StatusDeployed
return targetRelease, nil
}

Loading…
Cancel
Save