diff --git a/cmd/helm/install.go b/cmd/helm/install.go index 01bb9d30a..962ca3e15 100644 --- a/cmd/helm/install.go +++ b/cmd/helm/install.go @@ -267,7 +267,7 @@ func (i *installCmd) run() error { return fmt.Errorf("cannot load requirements: %v", err) } - resp, err := i.client.InstallReleaseFromChart( + res, err := i.client.InstallReleaseFromChart( chartRequested, i.namespace, helm.ValueOverrides(rawVals), @@ -298,6 +298,12 @@ func (i *installCmd) run() error { return prettyError(err) } + rel := res.GetRelease() + if rel == nil { + return nil + } + i.printRelease(rel) + // If this is a dry run, we can't display status. if i.dryRun { // This is special casing to avoid breaking backward compatibility: @@ -308,7 +314,7 @@ func (i *installCmd) run() error { } // Print the status like status command does - status, err := i.client.ReleaseStatus(i.name) + status, err := i.client.ReleaseStatus(rel.Name) if err != nil { return prettyError(err) } diff --git a/cmd/helm/rollback.go b/cmd/helm/rollback.go index 7d56dbbcc..889b6ae28 100644 --- a/cmd/helm/rollback.go +++ b/cmd/helm/rollback.go @@ -88,7 +88,7 @@ func newRollbackCmd(c helm.Interface, out io.Writer) *cobra.Command { } func (r *rollbackCmd) run() error { - resp, err := r.client.RollbackRelease( + _, err := r.client.RollbackRelease( r.name, helm.RollbackDryRun(r.dryRun), helm.RollbackRecreate(r.recreate), @@ -97,24 +97,6 @@ func (r *rollbackCmd) run() error { helm.RollbackVersion(r.revision), helm.RollbackTimeout(r.timeout), helm.RollbackWait(r.wait)) - - if settings.Debug { - // If there is an error while waiting, make a call without waiting to get the release content - if (resp == nil || resp.Release == nil) && r.wait { - if res, e := r.client.ReleaseContent(r.name); e != nil { - fmt.Fprintf(r.out, "Error reading release content: %v", prettyError(e)) - } else { - printRelease(r.out, res.Release) - } - } else { - rel := resp.GetRelease() - if rel == nil { - return nil - } - printRelease(r.out, rel) - } - } - if err != nil { return prettyError(err) }