6 files changed, 2 insertions, 28 deletions
diff --git a/kubernetes/common/common-templates/.helmignore b/kubernetes/common/.helmignore
index f0c1319444..f0c1319444 100644
--- a/kubernetes/common/common-templates/.helmignore
+++ b/kubernetes/common/.helmignore
diff --git a/kubernetes/common/common-templates/Chart.yaml b/kubernetes/common/Chart.yaml
index 01135755ba..aed57348e0 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 1900f31a44..0000000000
--- 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
index f6c221f15d..f6c221f15d 100644
--- a/kubernetes/common/common-templates/templates/_name.tpl
+++ b/kubernetes/common/templates/_name.tpl
diff --git a/kubernetes/common/common-templates/templates/_namespace.tpl b/kubernetes/common/templates/_namespace.tpl
index 2964a0f207..3da9fee7c1 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
index 112875753d..112875753d 100644
--- a/kubernetes/common/common-templates/values.yaml
+++ b/kubernetes/common/values.yaml