Remove namespace and assign in Jenkinsfile
Change-Id: I11a2a636375000fc18b00e26d10afe5b04f4ebc3
diff --git a/mcord/mcord-control-plane/templates/_helpers.tpl b/mcord/mcord-control-plane/templates/_helpers.tpl
index bb59df4..ec4bb37 100644
--- a/mcord/mcord-control-plane/templates/_helpers.tpl
+++ b/mcord/mcord-control-plane/templates/_helpers.tpl
@@ -31,10 +31,10 @@
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Values.namespace -}}
-{{- .Values.namespace | trunc 63 | trimSuffix "-" -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
{{- else -}}
-{{- printf "%s-%s" .Values.namespace $name | trunc 63 | trimSuffix "-" -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- end -}}
{{- end -}}