Merge pull request #1687 from aledbf/fix-merge

Fix use merge of annotations
kubernetes · Nov 11, 2017 · c64e9ae · c64e9ae
2 parents 27108da + 42dad7f
commit c64e9ae
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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)
 	}