Add name suffix for chart releases having more then 1 deployments

library/common/templates/classes/_service.tpl

@@ -5,9 +5,6 @@ within the common library.
 {{- define "common.classes.service" -}}
 {{- $values := .service -}}
 {{- $serviceName := include "common.names.fullname" . -}}
-{{- if hasKey $values "nameSuffix" -}}
-  {{- $serviceName = printf "%v-%v" $serviceName $values.nameSuffix -}}
-{{ end -}}
 {{- $svcType := $values.type | default "" -}}
 apiVersion: v1
 kind: Service

library/common/templates/lib/chart/_labels.tpl

@@ -15,5 +15,5 @@ Selector labels shared across objects.
 */}}
 {{- define "common.labels.selectorLabels" -}}
 app.kubernetes.io/name: {{ include "common.names.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
+app.kubernetes.io/instance: {{ include "common.names.releaseName" . }}
 {{- end }}

library/common/templates/lib/chart/_names.tpl

@@ -2,7 +2,12 @@
 Expand the name of the chart.
 */}}
 {{- define "common.names.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- $values := . -}}
+{{- $name := (default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-") }}
+{{- if hasKey $values "nameSuffix" -}}
+  {{- $name = (printf "%v-%v" $name $values.nameSuffix) -}}
+{{ end -}}
+{{- print $name -}}
 {{- end }}
 
 {{/*
@@ -11,12 +16,16 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 If release name contains chart name it will be used as a full name.
 */}}
 {{- define "common.names.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- $values := . -}}
+{{- if $values.fullnameOverride }}
+{{- $values.fullnameOverride | trunc 63 | trimSuffix "-" }}
 {{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- $name := default .Chart.Name $values.nameOverride }}
+{{- if hasKey $values "nameSuffix" -}}
+  {{- $name = (printf "%v-%v" $name $values.nameSuffix) -}}
+{{ end -}}
 {{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- $name = (.Release.Name | trunc 63 | trimSuffix "-") }}
 {{- else }}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
 {{- end }}
@@ -36,3 +45,17 @@ Determine service account name for deployment or statefulset.
 {{- define "common.names.serviceAccountName" -}}
 {{- (include "common.names.fullname" .) | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+
+{{/*
+Determine release name
+This will add a suffix to the release name if nameSuffix is set
+*/}}
+{{- define "common.names.releaseName" -}}
+{{- $values := . -}}
+{{- if hasKey $values "nameSuffix" -}}
+  {{- printf "%v-%v" .Release.Name $values.nameSuffix -}}
+{{- else -}}
+  {{- print .Release.Name -}}
+{{ end -}}
+{{- end -}}