From 79d5fb62db53266cedd0d7d63698a8cf444018b4 Mon Sep 17 00:00:00 2001
From: Kelvin Acosta <16613817+kelvin-acosta@users.noreply.github.com>
Date: Thu, 11 Dec 2025 18:57:40 -0500
Subject: [PATCH 1/2] Add Kustomization template for Helm CRDs directory

This change adds automatic generation of helm/crds/kustomization.yaml
to enable Kustomize-based CRD installation in Helm charts.

Changes:
- Add templates/helm/crds/kustomization.yaml.tpl template
- Include service-specific CRDs and common ACK CRDs
- Update releaseTemplatePaths to include the new template

The generated file lists all CRD resources for easy Kustomize usage,
including both service-specific CRDs and the common FieldExport and
IAMRoleSelector CRDs from ACK runtime.
---
 pkg/generate/ack/release.go                | 1 +
 templates/helm/crds/kustomization.yaml.tpl | 8 ++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 templates/helm/crds/kustomization.yaml.tpl

diff --git a/pkg/generate/ack/release.go b/pkg/generate/ack/release.go
index 59edbc6d..77899ce1 100644
--- a/pkg/generate/ack/release.go
+++ b/pkg/generate/ack/release.go
@@ -31,6 +31,7 @@ var (
 		"helm/templates/cluster-role-controller.yaml.tpl",
 		"helm/templates/_helpers.tpl.tpl",
 		"helm/Chart.yaml.tpl",
+		"helm/crds/kustomization.yaml.tpl",
 		"helm/values.yaml.tpl",
 		"helm/values.schema.json",
 		"helm/templates/NOTES.txt.tpl",
diff --git a/templates/helm/crds/kustomization.yaml.tpl b/templates/helm/crds/kustomization.yaml.tpl
new file mode 100644
index 00000000..8e3626a4
--- /dev/null
+++ b/templates/helm/crds/kustomization.yaml.tpl
@@ -0,0 +1,8 @@
+apiVersion: kustomize.config.k8s.io/v1
+kind: Kustomization
+resources:
+{{- range .CRDNames }}
+- {{ $.APIGroup }}_{{ . }}.yaml
+{{- end }}
+- services.k8s.aws_fieldexports.yaml
+- services.k8s.aws_iamroleselectors.yaml

From a374934d345936d87e31ad8fe44402c9b03fc605 Mon Sep 17 00:00:00 2001
From: Kelvin Acosta <16613817+kelvin-acosta@users.noreply.github.com>
Date: Fri, 12 Dec 2025 11:32:07 -0500
Subject: [PATCH 2/2] Fix kustomization.yaml apiVersion to use v1beta1

---
 templates/helm/crds/kustomization.yaml.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/helm/crds/kustomization.yaml.tpl b/templates/helm/crds/kustomization.yaml.tpl
index 8e3626a4..0842d947 100644
--- a/templates/helm/crds/kustomization.yaml.tpl
+++ b/templates/helm/crds/kustomization.yaml.tpl
@@ -1,4 +1,4 @@
-apiVersion: kustomize.config.k8s.io/v1
+apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
 {{- range .CRDNames }}