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>
diff --git a/kubernetes/common/common-templates/.helmignore b/kubernetes/common/.helmignore
similarity index 100%
rename from kubernetes/common/common-templates/.helmignore
rename to kubernetes/common/.helmignore
diff --git a/kubernetes/common/common-templates/Chart.yaml b/kubernetes/common/Chart.yaml
similarity index 79%
rename from kubernetes/common/common-templates/Chart.yaml
rename to kubernetes/common/Chart.yaml
index 0113575..aed5734 100644
--- a/kubernetes/common/common-templates/Chart.yaml
+++ b/kubernetes/common/Chart.yaml
@@ -1,4 +1,4 @@
apiVersion: v1
description: Common templates for inclusion in other charts
-name: common-templates
+name: common
version: 2.0.0
diff --git a/kubernetes/common/Makefile b/kubernetes/common/Makefile
deleted file mode 100644
index 1900f31..0000000
--- a/kubernetes/common/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-EXCLUDES := test
-HELM_CHARTS := $(filter-out $(EXCLUDES), $(patsubst %/.,%,$(wildcard */.)))
-
-.PHONY: $(EXCLUDES) $(HELM_CHARTS)
-
-all: $(HELM_CHARTS)
-
-$(HELM_CHARTS):
- @echo "\n[$@]"
- @make lint-$@
-
-make-%:
- @if [ -f $*/Makefile ]; then make -C $*; fi
-
-dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then helm dep up $*; fi
-
-lint-%: dep-%
- @if [ -f $*/Chart.yaml ]; then helm lint $*; fi
-
-clean:
- @rm -f */requirements.lock
- @rm -f *tgz */charts/*tgz
-%:
- @:
\ No newline at end of file
diff --git a/kubernetes/common/common-templates/templates/_name.tpl b/kubernetes/common/templates/_name.tpl
similarity index 100%
rename from kubernetes/common/common-templates/templates/_name.tpl
rename to kubernetes/common/templates/_name.tpl
diff --git a/kubernetes/common/common-templates/templates/_namespace.tpl b/kubernetes/common/templates/_namespace.tpl
similarity index 74%
rename from kubernetes/common/common-templates/templates/_namespace.tpl
rename to kubernetes/common/templates/_namespace.tpl
index 2964a0f..3da9fee 100644
--- a/kubernetes/common/common-templates/templates/_namespace.tpl
+++ b/kubernetes/common/templates/_namespace.tpl
@@ -4,8 +4,7 @@
using the following value:
- .Values.nsPrefix : override namespace prefix
- - .Values.nsSuffix : override namespace suffix
*/}}
{{- define "common.namespace" -}}
- {{- default .Release.Name .Values.nsPrefix -}}
+ {{- default .Release.Namespace .Values.nsPrefix -}}
{{- end -}}
diff --git a/kubernetes/common/common-templates/values.yaml b/kubernetes/common/values.yaml
similarity index 100%
rename from kubernetes/common/common-templates/values.yaml
rename to kubernetes/common/values.yaml