Merge "Move deployment-specific templates to parent chart"

[oom.git] / kubernetes / Makefile

diff --git a/kubernetes/Makefile b/kubernetes/Makefile
index 4cf9705..000be48 100644 (file)
--- a/kubernetes/Makefile
+++ b/kubernetes/Makefile
@@ -1,27 +1,22 @@
 PARENT_CHART := onap
 COMMON_CHARTS_DIR := common
-SETUP_CHARTS_DIR := setup
 # FIXME OOM-765
 ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 OUTPUT_DIR := $(ROOT_DIR)/dist
 PACKAGE_DIR := $(OUTPUT_DIR)/packages
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
-EXCLUDES := $(SETUP_CHARTS_DIR) $(COMMON_CHARTS_DIR) config oneclick readiness test dist $(PARENT_CHART) dcae
+EXCLUDES := $(COMMON_CHARTS_DIR) config oneclick readiness test dist helm $(PARENT_CHART) dcae
 HELM_CHARTS := $(filter-out $(EXCLUDES), $(patsubst %/.,%,$(wildcard */.))) $(PARENT_CHART)
 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 
-all: $(COMMON_CHARTS_DIR) $(SETUP_CHARTS_DIR) $(HELM_CHARTS)
+all: $(COMMON_CHARTS_DIR) $(HELM_CHARTS)
 
 common:
        @echo "\n[$@]"
        @make package-$@
 
-setup:
-       @echo "\n[$@]"
-       @make package-$@
-
 $(HELM_CHARTS):
        @echo "\n[$@]"
        @make package-$@