Support for multiple yaml documents in stdin/file

pkg/cli/values/options.go

@@ -17,6 +17,7 @@ limitations under the License.
 package values
 
 import (
+	"bytes"
 	"io/ioutil"
 	"net/url"
 	"os"
@@ -45,16 +46,18 @@ func (opts *Options) MergeValues(p getter.Providers) (map[string]interface{}, er
 	for _, filePath := range opts.ValueFiles {
 		currentMap := map[string]interface{}{}
 
-		bytes, err := readFile(filePath, p)
+		data, err := readFile(filePath, p)
 		if err != nil {
 			return nil, err
 		}
 
-		if err := yaml.Unmarshal(bytes, &currentMap); err != nil {
-			return nil, errors.Wrapf(err, "failed to parse %s", filePath)
+		for _, document := range splitYamlDocument(data) {
+			if err := yaml.Unmarshal(document, &currentMap); err != nil {
+				return nil, errors.Wrapf(err, "failed to parse %s", filePath)
+			}
+			// Merge with the previous map
+			base = mergeMaps(base, currentMap)
 		}
-		// Merge with the previous map
-		base = mergeMaps(base, currentMap)
 	}
 
 	// User specified a value via --set
@@ -74,11 +77,11 @@ func (opts *Options) MergeValues(p getter.Providers) (map[string]interface{}, er
 	// User specified a value via --set-file
 	for _, value := range opts.FileValues {
 		reader := func(rs []rune) (interface{}, error) {
-			bytes, err := readFile(string(rs), p)
+			data, err := readFile(string(rs), p)
 			if err != nil {
 				return nil, err
 			}
-			return string(bytes), err
+			return string(data), err
 		}
 		if err := strvals.ParseIntoFile(value, base, reader); err != nil {
 			return nil, errors.Wrap(err, "failed parsing --set-file data")
@@ -125,3 +128,7 @@ func readFile(filePath string, p getter.Providers) ([]byte, error) {
 	}
 	return data.Bytes(), err
 }
+
+func splitYamlDocument(data []byte) [][]byte {
+	return bytes.Split(data, []byte("\n---\n"))
+}