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 }}"