From db6a5b53edbb8cd7f33ff8029de159e9f8ef5cc9 Mon Sep 17 00:00:00 2001
From: Ming Quah <ming.quah@protonmail.com>
Date: Wed, 27 Jul 2022 08:48:20 +1000
Subject: [PATCH] Move custom resource definitions into a CRDs folder (#994)

* Add missing quote for port parameter

* Add step to move CRDs into the correct folder
---
 .helm/starter/templates/postgres-config.yaml | 2 +-
 Makefile                                     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.helm/starter/templates/postgres-config.yaml b/.helm/starter/templates/postgres-config.yaml
index d0f2aa40..4a1d9ecb 100644
--- a/.helm/starter/templates/postgres-config.yaml
+++ b/.helm/starter/templates/postgres-config.yaml
@@ -7,7 +7,7 @@ metadata:
 {{- with $.Values.AWX.postgres }}
 stringData:
   host: {{ .host }}
-  port: {{ .port }}
+  port: {{ .port | quote }}
   database: {{ .dbName }}
   username: {{ .username }}
   password: {{ .password }}
diff --git a/Makefile b/Makefile
index ceabc97a..1fd26a29 100644
--- a/Makefile
+++ b/Makefile
@@ -295,6 +295,8 @@ helm-chart-generate: kustomize helm kubectl-slice yq charts
 			--output-dir=charts/$(CHART_NAME)/templates \
 			--sort-by-kind
 	@echo "AWX Operator installed with Helm Chart version $(VERSION)" > charts/$(CHART_NAME)/templates/NOTES.txt
+	mkdir charts/$(CHART_NAME)/crds
+	mv charts/$(CHART_NAME)/templates/customresourcedefinition* charts/$(CHART_NAME)/crds
 
 .PHONY: helm-chart-edit
 helm-chart-slice: