fix the regression on merging configmap with different namespace

This commit is contained in:
jingfangliu
2019-07-09 13:32:33 -07:00
parent 08400d77a6
commit 49b32473ca
3 changed files with 42 additions and 0 deletions

View File

@@ -42,6 +42,7 @@ func (r *Resource) Replace(other *Resource) {
r.SetAnnotations(
mergeStringMaps(other.GetAnnotations(), r.GetAnnotations()))
r.SetName(other.GetName())
r.SetNamespace(other.GetNamespace())
r.copyOtherFields(other)
}