X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fcommon%2Fcommon%2Ftemplates%2F_service.tpl;h=77b77d059a09c66a568ece1cf9e0d071817eae6a;hb=8155f184225a4d4a8a0e11fb6d03d9fee8537472;hp=25e373a7c968dff34735d4f4b48d59513d64dd3e;hpb=89623667ec00a4710e2c2b9f77a31d369e62f790;p=oom.git

diff --git a/kubernetes/common/common/templates/_service.tpl b/kubernetes/common/common/templates/_service.tpl
index 25e373a7c9..77b77d059a 100644
--- a/kubernetes/common/common/templates/_service.tpl
+++ b/kubernetes/common/common/templates/_service.tpl
@@ -17,8 +17,8 @@
 {{/*
   Resolve the name of a chart's service.
 
-  The default will be the chart name, unless
-  overridden in the service configuration.
+  The default will be the chart name (or .Values.nameOverride if set).
+  And the use of .Values.service.name overrides all.
 
   - .Values.service.name  : override default service (ie. chart) name
 */}}
@@ -26,5 +26,6 @@
   Expand the service name for a chart.
 */}}
 {{- define "common.servicename" -}}
-  {{- default .Chart.Name .Values.service.name | trunc 63 | trimSuffix "-" -}}
+  {{- $name := default .Chart.Name .Values.nameOverride -}}
+  {{- default $name .Values.service.name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
\ No newline at end of file