From 2670b0ef2262f25176ed2f0e08867c3807ffdfa6 Mon Sep 17 00:00:00 2001
From: Mike Elliott <mike.elliott@amdocs.com>
Date: Wed, 21 Mar 2018 12:18:40 -0400
Subject: Add common location for shared charts

Moved shared templates into common directory.
This "common" location is where upcoming charts
for mariadb-galera, postgress etc. will reside.

Change-Id: Id2e2ffd3369a3e4d6437c2ca4f04a5f1dceb236a
Issue-ID: OOM-816
Signed-off-by: Mike Elliott <mike.elliott@amdocs.com>
---
 kubernetes/Makefile | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'kubernetes/Makefile')

diff --git a/kubernetes/Makefile b/kubernetes/Makefile
index 4cf97059ac..000be48048 100644
--- 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-$@
-- 
cgit 1.2.3-korg