Manage name changes (prefix/suffix) via YAML annotations rather than via in-memory-only fields.

api/resmap/factory_test.go

@@ -389,7 +389,6 @@ spec:
 
 	rm, err := rmF.ConflatePatches([]*resource.Resource{r1, r2})
 	assert.NoError(t, err)
-
 	yml, err = rm.AsYaml()
 	assert.NoError(t, err)
 

api/resmap/resmap.go

@@ -245,4 +245,6 @@ type ResMap interface {
 	// selected set of resources.
 	ApplySmPatch(
 		selectedSet *resource.IdSet, patch *resource.Resource) error
+
+	RemoveIdAnnotations() error
 }

api/resmap/reswrangler.go

@@ -589,6 +589,7 @@ func (m *resWrangler) ApplySmPatch(
 		patchCopy.SetName(res.GetName())
 		patchCopy.SetNamespace(res.GetNamespace())
 		patchCopy.SetGvk(res.GetGvk())
+		patchCopy.SetOriginalName(res.GetOriginalName(), true)
 		err := res.ApplySmPatch(patchCopy)
 		if err != nil {
 			// Check for an error string from UnmarshalJSON that's indicative
@@ -619,3 +620,13 @@ func (m *resWrangler) ApplySmPatch(
 	m.AppendAll(newRm)
 	return nil
 }
+
+func (m *resWrangler) RemoveIdAnnotations() error {
+	for _, r := range m.Resources() {
+		err := r.RemoveIdAnnotations()
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}

api/resmap/reswrangler_test.go

@@ -745,7 +745,6 @@ rules:
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
-
 	rnodes, err := rm.ToRNodeSlice()
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
@@ -999,6 +998,7 @@ spec:
 				return
 			}
 			assert.False(t, tc.errorExpected)
+			assert.NoError(t, m.RemoveIdAnnotations())
 			yml, err := m.AsYaml()
 			assert.NoError(t, err)
 			assert.Equal(t, strings.Join(tc.expected, "---\n"), string(yml))
@@ -1111,6 +1111,7 @@ $patch: delete
 			assert.NoError(t, err, name)
 			assert.NoError(t, m.ApplySmPatch(idSet, p), name)
 			assert.Equal(t, tc.finalMapSize, m.Size(), name)
+			assert.NoError(t, m.RemoveIdAnnotations())
 			yml, err := m.AsYaml()
 			assert.NoError(t, err, name)
 			assert.Equal(t, tc.expected, string(yml), name)