dilim/helm
1
0
Fork 0
mirror of https://github.com/helm/helm.git synced 2026-08-07 00:21:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add get values table output headers

Browse Source 
Signed-off-by: Dean Coakley <dean.s.coakley@gmail.com>
This commit is contained in:
Dean Coakley
2019-10-09 22:20:45 +01:00
parent 66268d9eee
commit 3c899d0bde
4 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
cmd/helm/get_values.go
View File

@@ -19,7 +19,6 @@ package main
import (
"io"
"github.com/gosuri/uitable"
"github.com/spf13/cobra"
"helm.sh/helm/v3/cmd/helm/require"
@@ -49,6 +48,16 @@ func newGetValuesCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
if err != nil {
return err
}
if outfmt == output.Table && client.AllValues {
_, err = out.Write([]byte("COMPUTED VALUES:\n"))
} else if outfmt == output.Table {
_, err = out.Write([]byte("USER-SUPPLIED VALUES:\n"))
}
if err != nil {
return err
}
return outfmt.Write(out, &valuesWriter{vals})
},
}
@@ -62,18 +71,13 @@ func newGetValuesCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
}
func (v valuesWriter) WriteTable(out io.Writer) error {
table := uitable.New()
table.AddRow("USER-SUPPLIED VALUES:")
for k, v := range v.vals {
table.AddRow(k, v)
}
return output.EncodeTable(out, table)
return output.EncodeYAML(out, v.vals)
}
func (v valuesWriter) WriteJSON(out io.Writer) error {
return output.EncodeJSON(out, v)
return output.EncodeJSON(out, v.vals)
}
func (v valuesWriter) WriteYAML(out io.Writer) error {
return output.EncodeYAML(out, v)
return output.EncodeYAML(out, v.vals)
}

2
cmd/helm/testdata/output/get-values.txt vendored
View File

@@ -1,2 +1,2 @@
USER-SUPPLIED VALUES:
name: value

2
cmd/helm/testdata/output/values.json vendored
View File

@@ -1 +1 @@
{"name": "value"}
{"name":"value"}

7
pkg/action/get_values.go
View File

@@ -39,19 +39,18 @@ func NewGetValues(cfg *Configuration) *GetValues {
// Run executes 'helm get values' against the given release.
func (g *GetValues) Run(name string) (map[string]interface{}, error) {
res, err := g.cfg.releaseContent(name, g.Version)
rel, err := g.cfg.releaseContent(name, g.Version)
if err != nil {
return nil, err
}
// If the user wants all values, compute the values and return.
if g.AllValues {
cfg, err := chartutil.CoalesceValues(res.Chart, res.Config)
cfg, err := chartutil.CoalesceValues(rel.Chart, rel.Config)
if err != nil {
return nil, err
}
return cfg, nil
}
return res.Chart.Values, nil
return rel.Config, nil
}