collect origin data only when the option is set

api/internal/target/kusttarget.go

@@ -113,7 +113,11 @@ func (kt *KustTarget) MakeCustomizedResMap() (resmap.ResMap, error) {
 }
 
 func (kt *KustTarget) makeCustomizedResMap() (resmap.ResMap, error) {
-	ra, err := kt.AccumulateTarget(&resource.Origin{})
+	var origin *resource.Origin
+	if utils.StringSliceContains(kt.kustomization.BuildMetadata, "originAnnotations") {
+		origin = &resource.Origin{}
+	}
+	ra, err := kt.AccumulateTarget(origin)
 	if err != nil {
 		return nil, err
 	}
@@ -392,7 +396,7 @@ func (kt *KustTarget) accumulateComponents(
 			return nil, fmt.Errorf("loader.New %q", errL)
 		}
 		var errD error
-		origin.Path = filepath.Join(origin.Path, path)
+		origin = origin.Append(path)
 		ra, errD = kt.accumulateDirectory(ra, ldr, origin, true)
 		if errD != nil {
 			return nil, fmt.Errorf("accumulateDirectory: %q", errD)
@@ -459,10 +463,10 @@ func (kt *KustTarget) accumulateFile(
 	if err != nil {
 		return errors.Wrapf(err, "accumulating resources from '%s'", path)
 	}
-	if utils.StringSliceContains(kt.kustomization.BuildMetadata, "originAnnotations") {
-		origin = origin.Append(path)
-		err = resources.AnnotateAll(utils.OriginAnnotation, origin.String())
-		if err != nil {
+	if origin != nil {
+		originAnno := origin.Append(path).String()
+		err = resources.AnnotateAll(utils.OriginAnnotation, originAnno)
+		if err != nil || originAnno == "" {
 			return errors.Wrapf(err, "cannot add path annotation for '%s'", path)
 		}
 	}

api/resource/origin.go

@@ -8,31 +8,38 @@ import (
 	"strings"
 
 	"sigs.k8s.io/kustomize/api/internal/git"
+	kyaml "sigs.k8s.io/kustomize/kyaml/yaml"
 )
 
 // Origin retains information about where resources in the output
 // of `kustomize build` originated from
 type Origin struct {
 	// Path is the path to the resource, rooted from the directory upon
 	// which `kustomize build` was invoked
-	Path string
+	Path string `json:"path,omitempty" yaml:"path,omitempty"`
 
 	// Repo is the remote repository that the resource originated from if it is
 	// not from a local file
-	Repo string
+	Repo string `json:"repo,omitempty" yaml:"repo,omitempty"`
 
 	// Ref is the ref of the remote repository that the resource originated from
 	// if it is not from a local file
-	Ref string
+	Ref string `json:"ref,omitempty" yaml:"ref,omitempty"`
 }
 
 // Copy returns a copy of origin
 func (origin *Origin) Copy() Origin {
+	if origin == nil {
+		return Origin{}
+	}
 	return *origin
 }
 
 // Append returns a copy of origin with a path appended to it
 func (origin *Origin) Append(path string) *Origin {
+	if origin == nil {
+		return origin
+	}
 	originCopy := origin.Copy()
 	repoSpec, err := git.NewRepoSpecFromUrl(path)
 	if err == nil {
@@ -48,13 +55,6 @@ func (origin *Origin) Append(path string) *Origin {
 
 // String returns a string version of origin
 func (origin *Origin) String() string {
-	var anno string
-	anno = anno + "path: " + origin.Path + "\n"
-	if origin.Repo != "" {
-		anno = anno + "repo: " + origin.Repo + "\n"
-	}
-	if origin.Ref != "" {
-		anno = anno + "ref: " + origin.Ref + "\n"
-	}
-	return anno
+	anno, _ := kyaml.Marshal(origin)
+	return string(anno)
 }