Merge pull request #249 from mengqiy/fix_nameprefix_overlay

fix a bug of nameprefix lost after applying patch

pkg/kinflate/commands/testdata/simple/out/expected.yaml

@@ -77,7 +77,7 @@ metadata:
     foo: bar
     org: kubernetes
     repo: test-infra
-  name: test-infra-mungebot
+  name: test-infra-baseprefix-mungebot
 spec:
   replicas: 2
   selector:

pkg/kinflate/util.go

@@ -254,6 +254,9 @@ func manifestToMap(m *manifest.Manifest,
 					return nil, err
 				}
 			}
+			// Store the name of the base object, because this name may have been munged.
+			// Apply this name to the StrategicMergePatched object.
+			baseName := base.GetName()
 			merged, err := strategicpatch.StrategicMergeMapPatch(
 				base.UnstructuredContent(),
 				overlay.UnstructuredContent(),
@@ -261,6 +264,7 @@ func manifestToMap(m *manifest.Manifest,
 			if err != nil {
 				return nil, err
 			}
+			base.SetName(baseName)
 			baseResourceMap[gvkn].Object = merged
 			delete(overlayResouceMap, gvkn)
 		}