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

Merge pull request #2012 from julienp/master

Browse Source 
Show namespace resource on id conflict
This commit is contained in:
Jeff Regan
2020-01-07 11:41:01 -08:00
committed by GitHub
parent f749a4a194 0988f74d39
commit bbceb49fc4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/builtins/NamespaceTransformer.go
View File

@@ -52,7 +52,7 @@ func (p *NamespaceTransformerPlugin) Transform(m resmap.ResMap) error {
matches := m.GetMatchingResourcesByCurrentId(r.CurId().Equals) matches := m.GetMatchingResourcesByCurrentId(r.CurId().Equals)
if len(matches) != 1 { if len(matches) != 1 {
return fmt.Errorf("namespace tranformation produces ID conflict: %#v", matches) return fmt.Errorf("namespace tranformation produces ID conflict: %+v", matches)
} }
} }
return nil return nil

2
plugin/builtin/namespacetransformer/NamespaceTransformer.go
View File

@@ -56,7 +56,7 @@ func (p *plugin) Transform(m resmap.ResMap) error {
matches := m.GetMatchingResourcesByCurrentId(r.CurId().Equals) matches := m.GetMatchingResourcesByCurrentId(r.CurId().Equals)
if len(matches) != 1 { if len(matches) != 1 {
return fmt.Errorf("namespace tranformation produces ID conflict: %#v", matches) return fmt.Errorf("namespace tranformation produces ID conflict: %+v", matches)
} }
} }
return nil return nil