Skip to content

Commit

Permalink
Merge pull request #141 from gschei/fix-missing-mergeoption
Browse files Browse the repository at this point in the history
fixed missing mergeoptions for CombineFromVariablesPatch
  • Loading branch information
phisco authored Aug 12, 2024
2 parents 58818a7 + 7e0df1b commit c3d4059
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion patches.go
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,12 @@ func ApplyCombineFromVariablesPatch(p PatchInterface, from, to runtime.Object) e
return err
}

return errors.Wrap(patchFieldValueToObject(p.GetToFieldPath(), out, to, nil), "cannot patch to object")
mo, err := toMergeOption(p)
if err != nil {
return err
}

return errors.Wrap(patchFieldValueToObject(p.GetToFieldPath(), out, to, mo), "cannot patch to object")
}

// ApplyEnvironmentPatch applies a patch to or from the environment. Patches to
Expand Down

0 comments on commit c3d4059

Please sign in to comment.