Check for err before working with newRelease. (#4630)

Should fix #4585.

Signed-off-by: Steve Wolter <swolter@google.com>
(cherry picked from commit e868da1705)
release-2.11 v2.11.0-rc.3
Steve Wolter 7 years ago committed by Matthew Fisher
parent 4cc4aa5785
commit 28d295be2a
No known key found for this signature in database
GPG Key ID: 92AA783CBAAE8E3B

@ -150,6 +150,8 @@ func (s *ReleaseServer) performUpdateForce(req *services.UpdateReleaseRequest) (
return nil, err
}
res := &services.UpdateReleaseResponse{}
newRelease, err := s.prepareRelease(&services.InstallReleaseRequest{
Chart: req.Chart,
Values: req.Values,
@ -161,11 +163,6 @@ func (s *ReleaseServer) performUpdateForce(req *services.UpdateReleaseRequest) (
Timeout: req.Timeout,
Wait: req.Wait,
})
// update new release with next revision number so as to append to the old release's history
newRelease.Version = oldRelease.Version + 1
res := &services.UpdateReleaseResponse{Release: newRelease}
if err != nil {
s.Log("failed update prepare step: %s", err)
// On dry run, append the manifest contents to a failed release. This is
@ -176,6 +173,10 @@ func (s *ReleaseServer) performUpdateForce(req *services.UpdateReleaseRequest) (
return res, err
}
// update new release with next revision number so as to append to the old release's history
newRelease.Version = oldRelease.Version + 1
res.Release = newRelease
if req.DryRun {
s.Log("dry run for %s", newRelease.Name)
res.Release.Info.Description = "Dry run complete"

Loading…
Cancel
Save