From a57d8dd090a3d3d747ba40ef58e14215e88adfa2 Mon Sep 17 00:00:00 2001
From: Mandeep Khinda <mandeep.khinda@amdocs.com>
Date: Fri, 9 Mar 2018 14:29:37 +0000
Subject: iterating on new helm structure for SO

with this change we can now do the following:

can deploy umbrella chart with currently working components:
helm install local/onap --name onap --namespace onap-all
helm install local/onap --name onap-2 --namespace onap-all-2 \
--set global.nodePortPrefix=303
- umbrella includes setup chart

can deploy a-la-carte component by component into a single namespace
- Need to deploy a setup chart first. cannot be made a helm dependency
as there will be conflicts if each app chart has the same setup dependency.
helm install local/setup --name onap-setup --namespace onap-apps
helm install local/so --name so1 --namespace onap-apps \
--set global.nodePortPrefix=304

helm list
NAME          REVISION    STATUS      CHART          NAMESPACE
onap          1           DEPLOYED    onap-2.0.0     onap-all
onap-2        1           DEPLOYED    onap-2.0.0     onap-all-2
onap-setup    1           DEPLOYED    setup-2.0.0    onap-apps
so1           1           DEPLOYED    so-2.0.0       onap-apps

Unfortunately, the config maps all have fixed names, so installing
the same app in the a-la-carte fashion will fail due to a collision.
Not worrying about this as I'm not sure we want to support this.

-made the common and setup charts standalone to remove relative file paths
from requirements.yaml
   This will help when there are different levels of subcharts that
need to include common

Issue-ID: OOM-786
Issue-ID: OOM-789
Issue-ID: OOM-788

Change-Id: I20bacae6f0f20e8f3bb1527af1e7e53f187341d5
Signed-off-by: Mandeep Khinda <mandeep.khinda@amdocs.com>
---
 kubernetes/Makefile | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'kubernetes/Makefile')

diff --git a/kubernetes/Makefile b/kubernetes/Makefile
index 5e8350492c..4cf97059ac 100644
--- a/kubernetes/Makefile
+++ b/kubernetes/Makefile
@@ -1,18 +1,26 @@
 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 := $(COMMON_CHARTS_DIR) config oneclick readiness test dist $(PARENT_CHART) dcae
-HELM_CHARTS := $(COMMON_CHARTS_DIR) $(filter-out $(EXCLUDES), $(patsubst %/.,%,$(wildcard */.))) $(PARENT_CHART)
+EXCLUDES := $(SETUP_CHARTS_DIR) $(COMMON_CHARTS_DIR) config oneclick readiness test dist $(PARENT_CHART) dcae
+HELM_CHARTS := $(filter-out $(EXCLUDES), $(patsubst %/.,%,$(wildcard */.))) $(PARENT_CHART)
 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS)
 
-all: $(HELM_CHARTS)
+all: $(COMMON_CHARTS_DIR) $(SETUP_CHARTS_DIR) $(HELM_CHARTS)
+
+common:
+	@echo "\n[$@]"
+	@make package-$@
+
+setup:
+	@echo "\n[$@]"
+	@make package-$@
 
 $(HELM_CHARTS):
 	@echo "\n[$@]"
-- 
cgit 1.2.3-korg