kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-11 00:52:55 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #3821 from phanimarupaka/OverrideIsSameResourceImpl

Browse Source 
Support multiple implementations for IsSameResource
This commit is contained in:
Kubernetes Prow Robot
2021-04-28 08:42:50 -07:00
committed by GitHub
parent 197c95f6ef 8a529ca399
commit 7716b1bd3d
3 changed files with 72 additions and 26 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