fix: separate chart packaging output directories (#519)

Author: mpryahin

Makefile

@@ -26,7 +26,7 @@ build-umbrella-chart: build-chart
 
 clean:
 	echo "Cleaning all projects..."	
-	@for dir in $(PROJECTS); do \
+	@for dir in $(PROJECTS) $(DISTRIB_CHARTS); do \
 		echo "Running make clean in $$dir..."; \
 		$(MAKE) -C $$dir clean; \
 	done

Makefile.build

@@ -4,7 +4,7 @@
 PACKAGABLE_SUBPROJECTS := $(shell find . -name "Chart.yaml.template" | xargs dirname | xargs dirname)
 
 .PHONY: clean
-clean: clean-go clean-python
+clean: clean-go clean-python clean-packagable
 
 .PHONY: clean-go
 clean-go:
@@ -14,6 +14,10 @@ clean-go:
 clean-python:
 	@$(call run_for_each,$(PY_SUBPROJECTS),Cleaning for Python component,clean)
 
+.PHONY: clean-packagable
+clean-packagable:
+	@$(call run_for_each,$(PACKAGABLE_SUBPROJECTS),Cleaning for packagable components,clean)
+
 .PHONY: build-image
 build-image: build-image-go build-image-python
 

Makefile.shared

@@ -93,20 +93,22 @@ build-chart-default:
 	TAG=$(TAG) COMPONENT_NAME=$(COMPONENT_NAME) envsubst < ${CHART_BUILD_DIR}/Chart.yaml.template > ${CHART_BUILD_DIR}/Chart.yaml
 	rm "${CHART_BUILD_DIR}/Chart.yaml.template"
 	helm dependency update ${CHART_BUILD_DIR}
-	helm package ${CHART_BUILD_DIR} --version ${TAG} --destination ${CHART_BUILD_DIR}
+	helm package ${CHART_BUILD_DIR} --version ${TAG} --destination ${BUILD_DIR}
 
 lint-chart-default: build-chart
 	@echo "Running chart linter for component: ${COMPONENT_NAME}"
 	helm lint --with-subcharts ${CHART_BUILD_DIR}
 
 publish-chart-default: build-chart
 	@echo "Publishing chart for component: ${COMPONENT_NAME}"
-	helm push ${CHART_BUILD_DIR}/${COMPONENT_NAME}-${TAG}.tgz oci://${CHARTS_REGISTRY}
+	helm push ${BUILD_DIR}/${COMPONENT_NAME}-${TAG}.tgz oci://${CHARTS_REGISTRY}
 
 clean:
+	@echo "Removing: $(BUILD_DIR)"
+	rm -rf $(BUILD_DIR)
 	@if [ -n "$(CLEAN_DIRS)" ]; then \
         echo "Removing: $(CLEAN_DIRS)"; \
-        rm -rf $(CLEAN_DIRS) $(BUILD_DIR); \
+        rm -rf $(CLEAN_DIRS); \
     fi
 
 # To suppress warnings when overriding Makefile targets, declare the abstract targets as <name>-default