Skip to content

Commit

Permalink
Fix use merge of annotations
Browse files Browse the repository at this point in the history
  • Loading branch information
aledbf committed Nov 11, 2017
1 parent 39c3085 commit 42dad7f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion internal/ingress/annotations/annotations.go
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ func (e Extractor) Extract(ing *extensions.Ingress) *Ingress {
}
}

err := mergo.Map(pia, data)
err := mergo.MapWithOverwrite(pia, data)
if err != nil {
glog.Errorf("unexpected error merging extracted annotations: %v", err)
}
Expand Down

0 comments on commit 42dad7f

Please sign in to comment.