suggested changes

api/krusty/configmaps_test.go

@@ -291,8 +291,6 @@ configMapGenerator:
     behavior: merge
     literals:
     - ANOTHER_ENV_VARIABLE="bar"
-    options:
-      disableNameSuffixHash: true
 `)
 	th.WriteF("cm.yaml", `
 apiVersion: v1

api/resource/resource.go

@@ -102,6 +102,8 @@ func (r *Resource) CopyMergeMetaDataFieldsFrom(other *Resource) error {
 
 func (r *Resource) copyKustomizeSpecificFields(other *Resource) {
 	r.refVarNames = copyStringSlice(other.refVarNames)
+	r.setRefBy(other.GetRefBy())
+	r.SetOptions(other.getOptions())
 }
 
 func (r *Resource) MergeDataMapFrom(o *Resource) {
@@ -302,17 +304,23 @@ func (r *Resource) getOptions() *types.GenArgs {
 		yaml.Unmarshal([]byte(genOptsAnno), &genOpts)
 		return types.NewGenArgs(&genOpts)
 	}
-	return &types.GenArgs{}
+	return nil
 }
 
 // SetOptions updates the generator options for the resource.
 func (r *Resource) SetOptions(o *types.GenArgs) {
+	annotations := r.GetAnnotations()
 	if o.IsNilOrEmpty() {
-		return
+		if len(annotations) == 0 {
+			return
+		}
+		if o == nil {
+			delete(annotations, utils.BuildAnnotationsGenOptions)
+		}
+	} else {
+		b, _ := yaml.Marshal(o.GetArgs())
+		annotations[utils.BuildAnnotationsGenOptions] = string(b)
 	}
-	annotations := r.GetAnnotations()
-	b, _ := yaml.Marshal(o.GetArgs())
-	annotations[utils.BuildAnnotationsGenOptions] = string(b)
 	r.SetAnnotations(annotations)
 }
 
@@ -367,6 +375,18 @@ func (r *Resource) CurId() resid.ResId {
 		r.GetGvk(), r.GetName(), r.GetNamespace())
 }
 
+// setRefBy sets the resource's RefBy annotation
+func (r *Resource) setRefBy(ids []resid.ResId) {
+	annotations := r.GetAnnotations()
+	if len(annotations) > 0 {
+		delete(annotations, utils.BuildAnnotationsRefBy)
+		r.SetAnnotations(annotations)
+	}
+	for _, id := range ids {
+		r.AppendRefBy(id)
+	}
+}
+
 // GetRefBy returns the ResIds that referred to current resource
 func (r *Resource) GetRefBy() []resid.ResId {
 	var resIds []resid.ResId

api/types/genargs.go

@@ -52,5 +52,8 @@ func (g *GenArgs) IsNilOrEmpty() bool {
 
 // GetArgs returns a copy of the underlying GeneratorArgs
 func (g *GenArgs) GetArgs() GeneratorArgs {
+	if g == nil || g.args == nil {
+		return GeneratorArgs{}
+	}
 	return *g.args
 }