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

Merge pull request #1939 from pwittrock/kyaml-comments

Browse Source 
Fix panic in merge2 comment merging
This commit is contained in:
Kubernetes Prow Robot
2019-12-11 20:02:32 -08:00
committed by GitHub
parent fe6dffff2e 4312ab3f4d
commit 54e8aab374
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kyaml/yaml/merge2/merge2.go
View File

@@ -97,6 +97,10 @@ func (m Merger) VisitList(nodes walk.Sources, kind walk.ListKind) (*yaml.RNode,
func (m Merger) SetComments(sources walk.Sources) error { func (m Merger) SetComments(sources walk.Sources) error {
source := sources.Origin() source := sources.Origin()
dest := sources.Dest() dest := sources.Dest()
if dest == nil || dest.YNode() == nil || source == nil || source.YNode() == nil {
// avoid panic
return nil
}
if source != nil && source.YNode().FootComment != "" { if source != nil && source.YNode().FootComment != "" {
dest.YNode().FootComment = source.YNode().FootComment dest.YNode().FootComment = source.YNode().FootComment
} }