kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-05-17 18:25:26 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Update merge3 with deafult GVKNN matcher

Browse Source
This commit is contained in:
Phani Teja Marupaka
2021-04-27 23:53:54 -07:00
parent 914a82bfa4
commit 8a529ca399
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/config/internal/commands/merge3.go
View File

@@ -46,12 +46,13 @@ type Merge3Runner struct {
path bool
}
func (r *Merge3Runner) runE(c *cobra.Command, args []string) error {
func (r *Merge3Runner) runE(_ *cobra.Command, _ []string) error {
matcher := filters.DefaultGVKNNMatcher{MergeOnPath: r.path}
err := filters.Merge3{
OriginalPath: r.ancestor,
UpdatedPath: r.fromDir,
DestPath: r.toDir,
MergeOnPath: r.path,
Matcher: &matcher,
}.Merge()
if err != nil {
return err