kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-09-15 12:18:57 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

wrap errors and add comments

Browse Source
This commit is contained in:
Krzysztof Gibuła
2024-01-23 21:03:34 +01:00
parent d768fc371c
commit bf286dce76
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
api/internal/builtins/HelmChartInflationGenerator.go
View File

@@ -204,25 +204,29 @@ func (p *HelmChartInflationGeneratorPlugin) replaceValuesInline() error {
} }
chValues, err := kyaml.Parse(string(pValues)) chValues, err := kyaml.Parse(string(pValues))
if err != nil { if err != nil {
return err return errors.WrapPrefixf(err, "could not parse values file into rnode")
} }
inlineValues, err := kyaml.FromMap(p.ValuesInline) inlineValues, err := kyaml.FromMap(p.ValuesInline)
if err != nil { if err != nil {
return err return errors.WrapPrefixf(err, "could not parse values inline into rnode")
} }
var outValues *kyaml.RNode var outValues *kyaml.RNode
switch p.ValuesMerge { switch p.ValuesMerge {
// Function `merge2.Merge` overrides values in dest with values from src.
// To achieve override or merge behavior, we pass parameters in different order.
// Object passed as dest will be modified, so we copy it just in case someone
// decides to use it after this is called.
case valuesMergeOptionOverride: case valuesMergeOptionOverride:
outValues, err = merge2.Merge(inlineValues, chValues, kyaml.MergeOptions{}) outValues, err = merge2.Merge(inlineValues, chValues.Copy(), kyaml.MergeOptions{})
case valuesMergeOptionMerge: case valuesMergeOptionMerge:
outValues, err = merge2.Merge(chValues, inlineValues, kyaml.MergeOptions{}) outValues, err = merge2.Merge(chValues, inlineValues.Copy(), kyaml.MergeOptions{})
} }
if err != nil { if err != nil {
return err return errors.WrapPrefixf(err, "could not merge values")
} }
mapValues, err := outValues.Map() mapValues, err := outValues.Map()
if err != nil { if err != nil {
return err return errors.WrapPrefixf(err, "could not parse merged values into map")
} }
p.ValuesInline = mapValues p.ValuesInline = mapValues
return err return err

16
plugin/builtin/helmchartinflationgenerator/HelmChartInflationGenerator.go
View File

@@ -210,25 +210,29 @@ func (p *plugin) replaceValuesInline() error {
} }
chValues, err := kyaml.Parse(string(pValues)) chValues, err := kyaml.Parse(string(pValues))
if err != nil { if err != nil {
return err return errors.WrapPrefixf(err, "could not parse values file into rnode")
} }
inlineValues, err := kyaml.FromMap(p.ValuesInline) inlineValues, err := kyaml.FromMap(p.ValuesInline)
if err != nil { if err != nil {
return err return errors.WrapPrefixf(err, "could not parse values inline into rnode")
} }
var outValues *kyaml.RNode var outValues *kyaml.RNode
switch p.ValuesMerge { switch p.ValuesMerge {
// Function `merge2.Merge` overrides values in dest with values from src.
// To achieve override or merge behavior, we pass parameters in different order.
// Object passed as dest will be modified, so we copy it just in case someone
// decides to use it after this is called.
case valuesMergeOptionOverride: case valuesMergeOptionOverride:
outValues, err = merge2.Merge(inlineValues, chValues, kyaml.MergeOptions{}) outValues, err = merge2.Merge(inlineValues, chValues.Copy(), kyaml.MergeOptions{})
case valuesMergeOptionMerge: case valuesMergeOptionMerge:
outValues, err = merge2.Merge(chValues, inlineValues, kyaml.MergeOptions{}) outValues, err = merge2.Merge(chValues, inlineValues.Copy(), kyaml.MergeOptions{})
} }
if err != nil { if err != nil {
return err return errors.WrapPrefixf(err, "could not merge values")
} }
mapValues, err := outValues.Map() mapValues, err := outValues.Map()
if err != nil { if err != nil {
return err return errors.WrapPrefixf(err, "could not parse merged values into map")
} }
p.ValuesInline = mapValues p.ValuesInline = mapValues
return err return err