feat(helm): add release debugging for upgrade

pull/1738/head
Adam Reese 9 years ago
parent 72a93efb48
commit 934249aadf

@ -283,13 +283,11 @@ func (i *installCmd) printRelease(rel *release.Release) {
return return
} }
// TODO: Switch to text/template like everything else. // TODO: Switch to text/template like everything else.
if flagDebug {
fmt.Fprintf(i.out, "NAME: %s\n", rel.Name) fmt.Fprintf(i.out, "NAME: %s\n", rel.Name)
if flagDebug {
fmt.Fprintf(i.out, "TARGET NAMESPACE: %s\n", rel.Namespace) fmt.Fprintf(i.out, "TARGET NAMESPACE: %s\n", rel.Namespace)
fmt.Fprintf(i.out, "CHART: %s %s\n", rel.Chart.Metadata.Name, rel.Chart.Metadata.Version) fmt.Fprintf(i.out, "CHART: %s %s\n", rel.Chart.Metadata.Name, rel.Chart.Metadata.Version)
fmt.Fprintf(i.out, "MANIFEST: %s\n", rel.Manifest) fmt.Fprintf(i.out, "MANIFEST: %s\n", rel.Manifest)
} else {
fmt.Fprintf(i.out, "NAME: %s\n", rel.Name)
} }
} }

@ -21,13 +21,17 @@ import (
"io" "io"
"io/ioutil" "io/ioutil"
"strings" "strings"
"time"
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"k8s.io/helm/cmd/helm/strvals" "k8s.io/helm/cmd/helm/strvals"
"k8s.io/helm/pkg/chartutil"
"k8s.io/helm/pkg/helm" "k8s.io/helm/pkg/helm"
"k8s.io/helm/pkg/proto/hapi/release"
"k8s.io/helm/pkg/storage/driver" "k8s.io/helm/pkg/storage/driver"
"k8s.io/helm/pkg/timeconv"
) )
const upgradeDesc = ` const upgradeDesc = `
@ -146,7 +150,7 @@ func (u *upgradeCmd) run() error {
return err return err
} }
_, err = u.client.UpdateRelease( resp, err := u.client.UpdateRelease(
u.release, u.release,
chartPath, chartPath,
helm.UpdateValueOverrides(rawVals), helm.UpdateValueOverrides(rawVals),
@ -157,8 +161,11 @@ func (u *upgradeCmd) run() error {
return fmt.Errorf("UPGRADE FAILED: %v", prettyError(err)) return fmt.Errorf("UPGRADE FAILED: %v", prettyError(err))
} }
success := u.release + " has been upgraded. Happy Helming!\n" if flagDebug {
fmt.Fprintf(u.out, success) u.printRelease(resp.Release)
}
fmt.Fprintf(u.out, "Release %q has been upgraded. Happy Helming!\n", u.release)
// Print the status like status command does // Print the status like status command does
status, err := u.client.ReleaseStatus(u.release) status, err := u.client.ReleaseStatus(u.release)
@ -194,3 +201,26 @@ func (u *upgradeCmd) vals() ([]byte, error) {
return yaml.Marshal(base) return yaml.Marshal(base)
} }
// printRelease prints info about a release.
func (u *upgradeCmd) printRelease(rel *release.Release) error {
if rel == nil {
return nil
}
cfg, err := chartutil.CoalesceValues(rel.Chart, rel.Config)
if err != nil {
return err
}
cfgStr, err := cfg.YAML()
if err != nil {
return err
}
data := map[string]interface{}{
"Release": rel,
"ComputedValues": cfgStr,
"ReleaseDate": timeconv.Format(rel.Info.LastDeployed, time.ANSIC),
}
return tpl(getTemplate, data, u.out)
}

@ -67,14 +67,14 @@ func TestUpgradeCmd(t *testing.T) {
name: "upgrade a release", name: "upgrade a release",
args: []string{"funny-bunny", chartPath}, args: []string{"funny-bunny", chartPath},
resp: releaseMock(&releaseOptions{name: "funny-bunny", version: 2, chart: ch}), resp: releaseMock(&releaseOptions{name: "funny-bunny", version: 2, chart: ch}),
expected: "funny-bunny has been upgraded. Happy Helming!\n", expected: "Release \"funny-bunny\" has been upgraded. Happy Helming!\n",
}, },
{ {
name: "install a release with 'upgrade --install'", name: "install a release with 'upgrade --install'",
args: []string{"zany-bunny", chartPath}, args: []string{"zany-bunny", chartPath},
flags: []string{"-i"}, flags: []string{"-i"},
resp: releaseMock(&releaseOptions{name: "zany-bunny", version: 1, chart: ch}), resp: releaseMock(&releaseOptions{name: "zany-bunny", version: 1, chart: ch}),
expected: "zany-bunny has been upgraded. Happy Helming!\n", expected: "Release \"zany-bunny\" has been upgraded. Happy Helming!\n",
}, },
} }

Loading…
Cancel
Save