upstream/helm
1
0
Fork 0
mirror of https://github.com/helm/helm.git synced 2026-05-28 04:35:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Include values from both --set and --values when specified on install

Browse source
This commit is contained in:
Trevor Hartman 2016-08-16 18:07:51 -06:00
parent 120256ecb3
commit dacc4013c1
1 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
cmd/helm/install.go
View file

@ -147,13 +147,28 @@ func (i *installCmd) run() error {
}
func (i *installCmd) vals() ([]byte, error) {
var buffer bytes.Buffer
// User specified a values file via -f/--values
if i.valuesFile != "" {
bytes, err := ioutil.ReadFile(i.valuesFile)
if err != nil {
return []byte{}, err
}
buffer.Write(bytes)
}
// User specified value pairs via --set
// These override any values in the specified file
if len(i.values.pairs) > 0 {
return i.values.yaml()
bytes, err := i.values.yaml()
if err != nil {
return []byte{}, err
}
buffer.Write(bytes)
}
if i.valuesFile == "" {
return []byte{}, nil
}
return ioutil.ReadFile(i.valuesFile)
return buffer.Bytes(), nil
}
func (i *installCmd) printRelease(rel *release.Release) {