Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixed missing mergeoptions for CombineFromVariablesPatch #141

Merged
merged 1 commit into from
Aug 12, 2024
Merged

fixed missing mergeoptions for CombineFromVariablesPatch #141

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion patches.go
View file
Open in desktop
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
Loading