Merge d592aff909 into 12f1bc0acd

pkg/cli/values/options.go

@@ -17,13 +17,14 @@ limitations under the License.
 package values
 
 import (
+	"io"
 	"io/ioutil"
 	"net/url"
 	"os"
 	"strings"
 
 	"github.com/pkg/errors"
-	"sigs.k8s.io/yaml"
+	"k8s.io/apimachinery/pkg/util/yaml"
 
 	"helm.sh/helm/v3/pkg/getter"
 	"helm.sh/helm/v3/pkg/strvals"
@@ -43,19 +44,26 @@ func (opts *Options) MergeValues(p getter.Providers) (map[string]interface{}, er
 
 	// User specified a values files via -f/--values
 	for _, filePath := range opts.ValueFiles {
-		currentMap := map[string]interface{}{}
-
 		bytes, err := readFile(filePath, p)
 		if err != nil {
 			return nil, err
 		}
 
-		if err := yaml.Unmarshal(bytes, &currentMap); err != nil {
+		decoder := yaml.NewYAMLOrJSONDecoder(strings.NewReader(string(bytes)), 4096)
+		for {
+			currentMap := map[string]interface{}{}
+
+			err := decoder.Decode(&currentMap)
+			if err == io.EOF {
+				break
+			} else if err != nil {
 				return nil, errors.Wrapf(err, "failed to parse %s", filePath)
 			}
+
 			// Merge with the previous map
 			base = mergeMaps(base, currentMap)
 		}
+	}
 
 	// User specified a value via --set
 	for _, value := range opts.Values {