extract controller kustomization to named template

komish · komish · commit 5f4c5d4b2c9f · 2021-03-04T16:01:57.000-06:00
diff --git a/pkg/generate/ack/controller.go b/pkg/generate/ack/controller.go
@@ -37,6 +37,7 @@ var (
 		"config/crd/kustomization.yaml.tpl",
 	}
 	controllerIncludePaths = []string{
+		"config/controller/kustomization_def.yaml.tpl",
 		"boilerplate.go.tpl",
 		"pkg/resource/sdk_find_read_one.go.tpl",
 		"pkg/resource/sdk_find_get_attributes.go.tpl",
diff --git a/templates/config/controller/kustomization.yaml.tpl b/templates/config/controller/kustomization.yaml.tpl
@@ -1,9 +1 @@
-resources:
-- deployment.yaml
-- service.yaml
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-images:
-- name: controller
-  newName: ack-{{ .ServiceIDClean }}-controller
-  newTag: latest
+{{ template "controller_kustomization" . }}
diff --git a/templates/config/controller/kustomization_def.yaml.tpl b/templates/config/controller/kustomization_def.yaml.tpl
@@ -0,0 +1,11 @@
+{{- define "controller_kustomization" -}}
+resources:
+- deployment.yaml
+- service.yaml
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+images:
+- name: controller
+  newName: ack-{{ .ServiceIDClean }}-controller
+  newTag: latest
+{{end}}

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ var (`
`37`	`37`	`"config/crd/kustomization.yaml.tpl",`
`38`	`38`	`}`
`39`	`39`	`controllerIncludePaths = []string{`
	`40`	`+ "config/controller/kustomization_def.yaml.tpl",`
`40`	`41`	`"boilerplate.go.tpl",`
`41`	`42`	`"pkg/resource/sdk_find_read_one.go.tpl",`
`42`	`43`	`"pkg/resource/sdk_find_get_attributes.go.tpl",`