Merge pull request #1687 from aledbf/fix-merge

Fix use merge of annotations
2017-11-11 15:58:50 -03:00 · 2017-11-11 15:58:50 -03:00 · c64e9aea7c
commit c64e9aea7c
parent 27108da170 42dad7fa60
1 changed files with 1 additions and 1 deletions
--- a/internal/ingress/annotations/annotations.go
+++ b/internal/ingress/annotations/annotations.go
@ -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)
 	}