From c23001681990cf8bb670f7c6adc36491adbb7a7d Mon Sep 17 00:00:00 2001
From: Christian Adams <chadams@redhat.com>
Date: Mon, 1 Aug 2022 17:27:15 -0400
Subject: [PATCH] Fix helm package build redundancy and release automation
 (#1010)

---
 Makefile                 | 2 ++
 ansible/helm-release.yml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 1fd26a29..facfaef4 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
+	# clean old crds dir before copying in newly generated CRDs
+	rm -rf charts/$(CHART_NAME)/crds
 	mkdir charts/$(CHART_NAME)/crds
 	mv charts/$(CHART_NAME)/templates/customresourcedefinition* charts/$(CHART_NAME)/crds
 
diff --git a/ansible/helm-release.yml b/ansible/helm-release.yml
index 7fca49d0..47e2c8e7 100644
--- a/ansible/helm-release.yml
+++ b/ansible/helm-release.yml
@@ -16,7 +16,7 @@
 
     - name: Build and package helm chart
       command: |
-        make helm-chart helm-package
+        make helm-package
       environment:
         VERSION: "{{ tag }}"
         IMAGE_TAG_BASE: "{{ operator_image }}"