Merge pull request #340 from vijtrip2/init-existing-tags

jaypipes · web-flow · commit a133935a9a93 · 2022-06-10T14:21:20.000-04:00
initialize existing tags inside rm.EnsureTags
diff --git a/templates/pkg/resource/manager.go.tpl b/templates/pkg/resource/manager.go.tpl
@@ -294,6 +294,8 @@ func (rm *resourceManager) EnsureTags(
     } else {
         existingTags = r.ko.Spec.{{ $tagField.Path }}
     }
+{{ else -}}
+    existingTags = r.ko.Spec.{{ $tagField.Path }}
 {{ end -}}
 	resourceTags := ToACKTags(existingTags)
 	tags := acktags.Merge(resourceTags, defaultTags)

Original file line number	Diff line number	Diff line change
`@@ -294,6 +294,8 @@ func (rm *resourceManager) EnsureTags(`
`294`	`294`	`} else {`
`295`	`295`	`existingTags = r.ko.Spec.{{ $tagField.Path }}`
`296`	`296`	`}`
	`297`	`+{{ else -}}`
	`298`	`+ existingTags = r.ko.Spec.{{ $tagField.Path }}`
`297`	`299`	`{{ end -}}`
`298`	`300`	`resourceTags := ToACKTags(existingTags)`
`299`	`301`	`tags := acktags.Merge(resourceTags, defaultTags)`