From 0e93fb5bfce4fcd462f5db0d9c6d1f29f2e742a6 Mon Sep 17 00:00:00 2001
From: kerenj <keren.joseph@amdocs.com>
Date: Tue, 6 Mar 2018 14:46:42 +0000
Subject: make so chart one namespace compatible

changed namespace to be nsPrefix only
added component name as prefix to chart name
changed all templated to use name instead of fullname

Issue-ID: OOM-784

Change-Id: If2288ba14e5f74a7f7ba4c2f9bf46eecc36feca7
Signed-off-by: kerenj <keren.joseph@amdocs.com>
---
 kubernetes/common/common-templates/templates/_namespace.tpl | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'kubernetes/common/common-templates/templates/_namespace.tpl')

diff --git a/kubernetes/common/common-templates/templates/_namespace.tpl b/kubernetes/common/common-templates/templates/_namespace.tpl
index 076fd53f7a..2964a0f207 100644
--- a/kubernetes/common/common-templates/templates/_namespace.tpl
+++ b/kubernetes/common/common-templates/templates/_namespace.tpl
@@ -7,7 +7,5 @@
   - .Values.nsSuffix  : override namespace suffix
 */}}
 {{- define "common.namespace" -}}
-  {{- $prefix := default .Release.Name .Values.nsPrefix -}}
-  {{- $suffix := default .Chart.Name .Values.nsSuffix -}}
-  {{- printf "%s-%s" $prefix $suffix -}}
+  {{- default .Release.Name .Values.nsPrefix -}}
 {{- end -}}
-- 
cgit