Update pkg/cli/values/options.go

Co-authored-by: George Jenkins <gvjenkins@gmail.com>
Signed-off-by: Jonathan <zhanweelee@gmail.com>
pull/30294/head
Jonathan 7 months ago committed by GitHub
parent 274d43c10d
commit 37020c32fa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -68,7 +68,7 @@ func (opts *Options) MergeValues(p getter.Providers) (map[string]interface{}, er
// If value is JSON object format, parse it as map // If value is JSON object format, parse it as map
var jsonMap map[string]interface{} var jsonMap map[string]interface{}
if err := json.Unmarshal([]byte(trimmedValue), &jsonMap); err != nil { if err := json.Unmarshal([]byte(trimmedValue), &jsonMap); err != nil {
return nil, errors.Errorf("failed parsing --set-json data using JSON format: %s", value) return nil, errors.Errorf("failed parsing --set-json data JSON: %s", value)
} }
base = mergeMaps(base, jsonMap) base = mergeMaps(base, jsonMap)
} else { } else {

Loading…
Cancel
Save