[ONAP-wide] Replace .Release.Name with common.release

ONAP is too big to be deployed using helm install so we need to
use a custom helm plugin helm deploy. This script deloys onap
component by component instead of deploying evrything at
once. Unfortunately this script also modifies the helm release by
appending component name to it.

As a result of this behavior our objects are called for example:

onap-mariadb-galera-mariadb-galera-0

instead of just being called onap-mariadb-galera-0.

This patch simplifies this naming convention by replacing all direct
usages of .Release.Name with common.release macro which strips the
component specific part from the release name.

Issue-ID: OOM-2275
Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>
Change-Id: I450057f5b4a10842f09665ecccc58e4ed727cd89

46 files changed, 109 insertions, 109 deletions

diff --git a/components/aai-babel/templates/configmap.yaml b/components/aai-babel/templates/configmap.yaml
index 031fc06..07e684d 100644
--- a/components/aai-babel/templates/configmap.yaml
+++ b/components/aai-babel/templates/configmap.yaml
@@ -21,7 +21,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 data:
 {{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
diff --git a/components/aai-babel/templates/deployment.yaml b/components/aai-babel/templates/deployment.yaml
index ea6e64a..71fbd94 100644
--- a/components/aai-babel/templates/deployment.yaml
+++ b/components/aai-babel/templates/deployment.yaml
@@ -21,7 +21,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
   replicas: {{ .Values.replicaCount }}
@@ -29,7 +29,7 @@ spec:
     metadata:
       labels:
         app: {{ include "common.name" . }}
-        release: {{ .Release.Name }}
+        release: {{ include "common.release" . }}
     spec:
     {{ if .Values.global.installSidecarSecurity }}
       hostAliases:
diff --git a/components/aai-babel/templates/secrets.yaml b/components/aai-babel/templates/secrets.yaml
index 7c3b04a..adc2220 100644
--- a/components/aai-babel/templates/secrets.yaml
+++ b/components/aai-babel/templates/secrets.yaml
@@ -21,7 +21,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 type: Opaque
 data:
@@ -35,7 +35,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 type: Opaque
 data:
@@ -52,7 +52,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 type: Opaque
 data:
@@ -66,7 +66,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 type: Opaque
 data:
@@ -80,7 +80,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 type: Opaque
 data:
diff --git a/components/aai-babel/templates/service.yaml b/components/aai-babel/templates/service.yaml
index 9a8b8a2..69892ac 100644
--- a/components/aai-babel/templates/service.yaml
+++ b/components/aai-babel/templates/service.yaml
@@ -21,7 +21,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
   type: {{ .Values.service.type }}
@@ -49,4 +49,4 @@ spec:
   {{ end }}
   selector:
     app: {{ include "common.name" . }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
diff --git a/components/aai-data-router/templates/configmap.yaml b/components/aai-data-router/templates/configmap.yaml
index c8532b2..93b498a 100644
--- a/components/aai-data-router/templates/configmap.yaml
+++ b/components/aai-data-router/templates/configmap.yaml
@@ -20,7 +20,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 data:
 {{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
@@ -33,7 +33,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 data:
 {{ tpl (.Files.Glob "resources/dynamic/routes/entity-event.route").AsConfig . | indent 2 }}
@@ -49,7 +49,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 data:
 {{ tpl (.Files.Glob "resources/config/log/*").AsConfig . | indent 2 }}
@@ -62,7 +62,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 data:
 {{ tpl (.Files.Glob "resources/config/log/filebeat/*").AsConfig . | indent 2 }}
diff --git a/components/aai-data-router/templates/deployment.yaml b/components/aai-data-router/templates/deployment.yaml
index 5c0d9b2..d8c5165 100644
--- a/components/aai-data-router/templates/deployment.yaml
+++ b/components/aai-data-router/templates/deployment.yaml
@@ -21,7 +21,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
   replicas: {{ .Values.replicaCount }}
@@ -32,7 +32,7 @@ spec:
     metadata:
       labels:
         app: {{ include "common.name" . }}
-        release: {{ .Release.Name }}
+        release: {{ include "common.release" . }}
       name: {{ include "common.name" . }}
     spec:
       {{- if .Values.nodeSelector }}
diff --git a/components/aai-data-router/templates/secret.yaml b/components/aai-data-router/templates/secret.yaml
index 6084ca3..292e035 100644
--- a/components/aai-data-router/templates/secret.yaml
+++ b/components/aai-data-router/templates/secret.yaml
@@ -20,7 +20,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 type: Opaque
 data:
diff --git a/components/aai-elasticsearch/templates/configmap.yaml b/components/aai-elasticsearch/templates/configmap.yaml
index 5067c83..b3af5da 100644
--- a/components/aai-elasticsearch/templates/configmap.yaml
+++ b/components/aai-elasticsearch/templates/configmap.yaml
@@ -20,7 +20,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 data:
 {{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
diff --git a/components/aai-elasticsearch/templates/deployment.yaml b/components/aai-elasticsearch/templates/deployment.yaml
index 3b8141c..1f864e4 100644
--- a/components/aai-elasticsearch/templates/deployment.yaml
+++ b/components/aai-elasticsearch/templates/deployment.yaml
@@ -20,7 +20,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
   replicas: {{ .Values.replicaCount }}
@@ -31,7 +31,7 @@ spec:
     metadata:
       labels:
         app: {{ include "common.name" . }}
-        release: {{ .Release.Name }}
+        release: {{ include "common.release" . }}
       name: {{ include "common.name" . }}
     spec:
       hostname: {{ include "common.name" . }}
diff --git a/components/aai-elasticsearch/templates/pv.yaml b/components/aai-elasticsearch/templates/pv.yaml
index f62c040..0838e33 100644
--- a/components/aai-elasticsearch/templates/pv.yaml
+++ b/components/aai-elasticsearch/templates/pv.yaml
@@ -23,7 +23,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
-    release: "{{ .Release.Name }}"
+    release: "{{ include "common.release" . }}"
     heritage: "{{ .Release.Service }}"
     name: {{ include "common.fullname" . }}
   annotations:
@@ -38,5 +38,5 @@ spec:
   persistentVolumeReclaimPolicy: {{ .Values.persistence.volumeReclaimPolicy }}
   storageClassName: "{{ include "common.fullname" . }}-data"
   hostPath:
-    path: {{ .Values.global.persistence.mountPath | default .Values.persistence.mountPath }}/{{ .Release.Name }}/{{ .Values.persistence.mountSubPath }}
+    path: {{ .Values.global.persistence.mountPath | default .Values.persistence.mountPath }}/{{ include "common.release" . }}/{{ .Values.persistence.mountSubPath }}
 {{- end -}}
\ No newline at end of file
diff --git a/components/aai-elasticsearch/templates/pvc.yaml b/components/aai-elasticsearch/templates/pvc.yaml
index a3425d3..513a7e8 100644
--- a/components/aai-elasticsearch/templates/pvc.yaml
+++ b/components/aai-elasticsearch/templates/pvc.yaml
@@ -22,7 +22,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
+    release: "{{ include "common.release" . }}"
     heritage: "{{ .Release.Service }}"
 {{- if .Values.persistence.annotations }}
 {{ toYaml .Values.persistence.annotations | indent 4 }}
diff --git a/components/aai-elasticsearch/templates/service.yaml b/components/aai-elasticsearch/templates/service.yaml
index d119912..68d767b 100644
--- a/components/aai-elasticsearch/templates/service.yaml
+++ b/components/aai-elasticsearch/templates/service.yaml
@@ -20,7 +20,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
   type: {{ .Values.service.type }}
@@ -40,5 +40,5 @@ spec:
   {{- end}}
   selector:
     app: {{ include "common.name" . }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
   clusterIP: None
diff --git a/components/aai-graphadmin/templates/configmap.yaml b/components/aai-graphadmin/templates/configmap.yaml
index bd229d3..e704743 100644
--- a/components/aai-graphadmin/templates/configmap.yaml
+++ b/components/aai-graphadmin/templates/configmap.yaml
@@ -25,7 +25,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
   {{- if .Values.global.jobs.migration.enabled }}
   annotations:
@@ -52,7 +52,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
   annotations:
     "helm.sh/hook": pre-upgrade,pre-install
diff --git a/components/aai-graphadmin/templates/deployment.yaml b/components/aai-graphadmin/templates/deployment.yaml
index f768603..a86fefa 100644
--- a/components/aai-graphadmin/templates/deployment.yaml
+++ b/components/aai-graphadmin/templates/deployment.yaml
@@ -24,7 +24,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
   replicas: {{ .Values.replicaCount }}
@@ -35,7 +35,7 @@ spec:
     metadata:
       labels:
         app: {{ include "common.name" . }}
-        release: {{ .Release.Name }}
+        release: {{ include "common.release" . }}
       name: {{ include "common.name" . }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
@@ -48,12 +48,12 @@ spec:
         - /root/job_complete.py
         args:
         - --job-name
-        - {{ .Release.Name }}-aai-graphadmin-migration
+        - {{ include "common.release" . }}-aai-graphadmin-migration
       {{  else if .Values.global.jobs.createSchema.enabled  }}
         - /root/job_complete.py
         args:
         - --job-name
-        - {{ .Release.Name }}-aai-graphadmin-create-db-schema
+        - {{ include "common.release" . }}-aai-graphadmin-create-db-schema
       {{  else }}
         - /root/ready.py
         args:
diff --git a/components/aai-graphadmin/templates/job-copy-db-backup.yaml b/components/aai-graphadmin/templates/job-copy-db-backup.yaml
index 80ccca3..ba74ef1 100644
--- a/components/aai-graphadmin/templates/job-copy-db-backup.yaml
+++ b/components/aai-graphadmin/templates/job-copy-db-backup.yaml
@@ -38,7 +38,7 @@ metadata:
   namespace: {{ include "common.namespace" . }}
   labels:
     app: {{ include "common.name" . }}-job
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
   annotations:
@@ -51,7 +51,7 @@ spec:
     metadata:
       labels:
         app: {{ include "common.name" . }}-job
-        release: {{ .Release.Name }}
+        release: {{ include "common.release" . }}
       name: {{ include "common.name" . }}
     spec:
       {{ if eq .Values.global.jobs.migration.remoteCassandra.enabled false }}
diff --git a/components/aai-graphadmin/templates/job-create-db.yaml b/components/aai-graphadmin/templates/job-create-db.yaml
index 1647260..2ab57b6 100644
--- a/components/aai-graphadmin/templates/job-create-db.yaml
+++ b/components/aai-graphadmin/templates/job-create-db.yaml
@@ -38,7 +38,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}-job
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
   backoffLimit: 20
@@ -46,7 +46,7 @@ spec:
     metadata:
       labels:
         app: {{ include "common.name" . }}-job
-        release: {{ .Release.Name }}
+        release: {{ include "common.release" . }}
       name: {{ include "common.name" . }}
     spec:
       initContainers:
diff --git a/components/aai-graphadmin/templates/job-migration.yaml b/components/aai-graphadmin/templates/job-migration.yaml
index 9815e66..37740be 100644
--- a/components/aai-graphadmin/templates/job-migration.yaml
+++ b/components/aai-graphadmin/templates/job-migration.yaml
@@ -39,7 +39,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}-job
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
   annotations:
     "helm.sh/hook": post-upgrade,post-rollback,post-install
@@ -51,7 +51,7 @@ spec:
     metadata:
       labels:
         app: {{ include "common.name" . }}-job
-        release: {{ .Release.Name }}
+        release: {{ include "common.release" . }}
       name: {{ include "common.name" . }}
     spec:
       initContainers:
@@ -206,7 +206,7 @@ metadata:
   namespace: {{ include "common.namespace" . }}
   labels:
     app: {{ include "common.name" . }}-db-backup-job
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
   annotations:
@@ -219,7 +219,7 @@ spec:
     metadata:
       labels:
         app: {{ include "common.name" . }}-db-backup-job
-        release: {{ .Release.Name }}
+        release: {{ include "common.release" . }}
       name: {{ include "common.name" . }}
     spec:
       {{ if eq .Values.global.jobs.migration.remoteCassandra.enabled false }}
diff --git a/components/aai-graphadmin/templates/pv.yaml b/components/aai-graphadmin/templates/pv.yaml
index e790e6a..563b920 100644
--- a/components/aai-graphadmin/templates/pv.yaml
+++ b/components/aai-graphadmin/templates/pv.yaml
@@ -24,7 +24,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
-    release: "{{ .Release.Name }}"
+    release: "{{ include "common.release" . }}"
     heritage: "{{ .Release.Service }}"
     name: {{ include "common.fullname" . }}
   annotations:
@@ -39,6 +39,6 @@ spec:
   persistentVolumeReclaimPolicy: {{ .Values.persistence.volumeReclaimPolicy }}
   storageClassName: "{{ include "common.fullname" . }}-data"
   hostPath:
-    path: {{ .Values.global.persistence.mountPath | default .Values.persistence.mountPath }}/{{ .Release.Name }}/{{ .Values.persistence.mountSubPath1 }}
+    path: {{ .Values.global.persistence.mountPath | default .Values.persistence.mountPath }}/{{ include "common.release" . }}/{{ .Values.persistence.mountSubPath1 }}
 {{- end -}}
 {{- end -}}
diff --git a/components/aai-graphadmin/templates/pvc.yaml b/components/aai-graphadmin/templates/pvc.yaml
index 14e07d1..bf89006 100644
--- a/components/aai-graphadmin/templates/pvc.yaml
+++ b/components/aai-graphadmin/templates/pvc.yaml
@@ -23,7 +23,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
+    release: "{{ include "common.release" . }}"
     heritage: "{{ .Release.Service }}"
   annotations:
     "helm.sh/hook": pre-upgrade,pre-install
diff --git a/components/aai-graphadmin/templates/service.yaml b/components/aai-graphadmin/templates/service.yaml
index f4d9ba5..ab6c677 100644
--- a/components/aai-graphadmin/templates/service.yaml
+++ b/components/aai-graphadmin/templates/service.yaml
@@ -25,7 +25,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
   type: {{ .Values.service.type }}
@@ -45,5 +45,5 @@ spec:
   {{- end}}
   selector:
     app: {{ include "common.name" . }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
   clusterIP: None
diff --git a/components/aai-modelloader/templates/configmap.yaml b/components/aai-modelloader/templates/configmap.yaml
index cdb01fb..d1b14e4 100644
--- a/components/aai-modelloader/templates/configmap.yaml
+++ b/components/aai-modelloader/templates/configmap.yaml
@@ -20,7 +20,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 data:
 {{ tpl (.Files.Glob "resources/config/model-loader.properties").AsConfig . | indent 2 }}
@@ -33,7 +33,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 data:
 {{ tpl (.Files.Glob "resources/config/log/logback.xml").AsConfig . | indent 2 }}
diff --git a/components/aai-modelloader/templates/deployment.yaml b/components/aai-modelloader/templates/deployment.yaml
index f34693f..820a797 100644
--- a/components/aai-modelloader/templates/deployment.yaml
+++ b/components/aai-modelloader/templates/deployment.yaml
@@ -21,7 +21,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
   replicas: {{ .Values.replicaCount }}
@@ -32,7 +32,7 @@ spec:
     metadata:
       labels:
         app: {{ include "common.name" . }}
-        release: {{ .Release.Name }}
+        release: {{ include "common.release" . }}
       name: {{ include "common.name" . }}
     spec:
       {{- if .Values.nodeSelector }}
diff --git a/components/aai-modelloader/templates/secret.yaml b/components/aai-modelloader/templates/secret.yaml
index 6084ca3..292e035 100644
--- a/components/aai-modelloader/templates/secret.yaml
+++ b/components/aai-modelloader/templates/secret.yaml
@@ -20,7 +20,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 type: Opaque
 data:
diff --git a/components/aai-modelloader/templates/service.yaml b/components/aai-modelloader/templates/service.yaml
index 567d42d..37ed1de 100644
--- a/components/aai-modelloader/templates/service.yaml
+++ b/components/aai-modelloader/templates/service.yaml
@@ -20,7 +20,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
   type: {{ .Values.service.type }}
@@ -40,4 +40,4 @@ spec:
   {{- end}}
   selector:
     app: {{ include "common.name" . }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
diff --git a/components/aai-resources/templates/configmap.yaml b/components/aai-resources/templates/configmap.yaml
index a4c2e31..ccbeae3 100644
--- a/components/aai-resources/templates/configmap.yaml
+++ b/components/aai-resources/templates/configmap.yaml
@@ -20,7 +20,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 data:
 {{ tpl (.Files.Glob "resources/config/logback.xml").AsConfig . | indent 2 }}
@@ -39,7 +39,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 data:
 {{ tpl (.Files.Glob "resources/config/aaf/org.osaaf.location.props").AsConfig . | indent 2 }}
@@ -56,7 +56,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 type: Opaque
 data:
@@ -74,7 +74,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 data:
 {{ tpl (.Files.Glob "resources/config/auth/aai_policy.json").AsConfig . | indent 2 }}
@@ -95,7 +95,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 data:
 {{ tpl (.Files.Glob "resources/fproxy/config/logback-spring.xml").AsConfig . | indent 2 }}
@@ -125,7 +125,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 data:
 {{ tpl (.Files.Glob "resources/rproxy/config/logback-spring.xml").AsConfig . | indent 2 }}
diff --git a/components/aai-resources/templates/deployment.yaml b/components/aai-resources/templates/deployment.yaml
index b2db730..3eccd1a 100644
--- a/components/aai-resources/templates/deployment.yaml
+++ b/components/aai-resources/templates/deployment.yaml
@@ -21,7 +21,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
   replicas: {{ .Values.replicaCount }}
@@ -32,7 +32,7 @@ spec:
     metadata:
       labels:
         app: {{ include "common.name" . }}
-        release: {{ .Release.Name }}
+        release: {{ include "common.release" . }}
       name: {{ include "common.name" . }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
@@ -1187,12 +1187,12 @@ spec:
         - /root/job_complete.py
         args:
         - --job-name
-        - {{ .Release.Name }}-aai-graphadmin-migration
+        - {{ include "common.release" . }}-aai-graphadmin-migration
       {{  else if .Values.global.jobs.createSchema.enabled  }}
         - /root/job_complete.py
         args:
         - --job-name
-        - {{ .Release.Name }}-aai-graphadmin-create-db-schema
+        - {{ include "common.release" . }}-aai-graphadmin-create-db-schema
       {{  else }}
         - /root/ready.py
         args:
diff --git a/components/aai-resources/templates/service.yaml b/components/aai-resources/templates/service.yaml
index d119912..68d767b 100644
--- a/components/aai-resources/templates/service.yaml
+++ b/components/aai-resources/templates/service.yaml
@@ -20,7 +20,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
   type: {{ .Values.service.type }}
@@ -40,5 +40,5 @@ spec:
   {{- end}}
   selector:
     app: {{ include "common.name" . }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
   clusterIP: None
diff --git a/components/aai-schema-service/templates/configmap.yaml b/components/aai-schema-service/templates/configmap.yaml
index 91a831a..9b7ea73 100644
--- a/components/aai-schema-service/templates/configmap.yaml
+++ b/components/aai-schema-service/templates/configmap.yaml
@@ -20,7 +20,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 data:
 {{ tpl (.Files.Glob "config/logback.xml").AsConfig . | indent 2 }}
@@ -33,7 +33,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 data:
 {{ tpl (.Files.Glob "config/localhost-access-logback.xml").AsConfig . | indent 2 }}
@@ -46,7 +46,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 data:
 {{ tpl (.Files.Glob "config/aaiconfig.properties").AsConfig . | indent 2 }}
@@ -59,7 +59,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 data:
 {{ tpl (.Files.Glob "config/application.properties").AsConfig . | indent 2 }}
@@ -72,7 +72,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 data:
 {{ tpl (.Files.Glob "config/realm.properties").AsConfig . | indent 2 }}
diff --git a/components/aai-schema-service/templates/deployment.yaml b/components/aai-schema-service/templates/deployment.yaml
index 38a19d3..95849f8 100644
--- a/components/aai-schema-service/templates/deployment.yaml
+++ b/components/aai-schema-service/templates/deployment.yaml
@@ -21,7 +21,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
   replicas: {{ .Values.replicaCount }}
@@ -32,7 +32,7 @@ spec:
     metadata:
       labels:
         app: {{ include "common.name" . }}
-        release: {{ .Release.Name }}
+        release: {{ include "common.release" . }}
       name: {{ include "common.name" . }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
diff --git a/components/aai-schema-service/templates/service.yaml b/components/aai-schema-service/templates/service.yaml
index d119912..68d767b 100644
--- a/components/aai-schema-service/templates/service.yaml
+++ b/components/aai-schema-service/templates/service.yaml
@@ -20,7 +20,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
   type: {{ .Values.service.type }}
@@ -40,5 +40,5 @@ spec:
   {{- end}}
   selector:
     app: {{ include "common.name" . }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
   clusterIP: None
diff --git a/components/aai-search-data/templates/configmap.yaml b/components/aai-search-data/templates/configmap.yaml
index 4361aa4..0ef6aa9 100644
--- a/components/aai-search-data/templates/configmap.yaml
+++ b/components/aai-search-data/templates/configmap.yaml
@@ -20,7 +20,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 data:
 {{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
@@ -33,7 +33,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 data:
 {{ tpl (.Files.Glob "resources/config/log/logback.xml").AsConfig . | indent 2 }}
diff --git a/components/aai-search-data/templates/deployment.yaml b/components/aai-search-data/templates/deployment.yaml
index b63c4c5..4209c55 100644
--- a/components/aai-search-data/templates/deployment.yaml
+++ b/components/aai-search-data/templates/deployment.yaml
@@ -21,7 +21,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
   replicas: {{ .Values.replicaCount }}
@@ -32,7 +32,7 @@ spec:
     metadata:
       labels:
         app: {{ include "common.name" . }}
-        release: {{ .Release.Name }}
+        release: {{ include "common.release" . }}
       name: {{ include "common.name" . }}
     spec:
     {{ if .Values.global.installSidecarSecurity }}
diff --git a/components/aai-search-data/templates/secret.yaml b/components/aai-search-data/templates/secret.yaml
index 9af326c..1ae4f4d 100644
--- a/components/aai-search-data/templates/secret.yaml
+++ b/components/aai-search-data/templates/secret.yaml
@@ -20,7 +20,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 type: Opaque
 data:
@@ -34,7 +34,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 data:
 {{ tpl (.Files.Glob "resources/config/auth/search_policy.json").AsSecrets . | indent 2 }}
diff --git a/components/aai-search-data/templates/service.yaml b/components/aai-search-data/templates/service.yaml
index 73a4d62..8898079 100644
--- a/components/aai-search-data/templates/service.yaml
+++ b/components/aai-search-data/templates/service.yaml
@@ -20,7 +20,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
   type: {{ .Values.service.type }}
@@ -49,5 +49,5 @@ spec:
 {{ end }}
   selector:
     app: {{ include "common.name" . }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
   clusterIP: None
diff --git a/components/aai-sparky-be/templates/configmap.yaml b/components/aai-sparky-be/templates/configmap.yaml
index 50238aa..9e0a572 100644
--- a/components/aai-sparky-be/templates/configmap.yaml
+++ b/components/aai-sparky-be/templates/configmap.yaml
@@ -20,7 +20,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 data:
 {{ tpl (.Files.Glob "resources/config/application.properties").AsConfig . | indent 2 }}
@@ -40,7 +40,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 data:
 {{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
@@ -53,7 +53,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 data:
 {{ tpl (.Files.Glob "resources/config/portal/*").AsConfig . | indent 2 }}
@@ -66,7 +66,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 data:
 {{ tpl (.Files.Glob "resources/config/portal/BOOT-INF/classes/*").AsConfig . | indent 2 }}
diff --git a/components/aai-sparky-be/templates/deployment.yaml b/components/aai-sparky-be/templates/deployment.yaml
index ee18d9b..93919c1 100644
--- a/components/aai-sparky-be/templates/deployment.yaml
+++ b/components/aai-sparky-be/templates/deployment.yaml
@@ -21,7 +21,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
   replicas: {{ .Values.replicaCount }}
@@ -32,7 +32,7 @@ spec:
     metadata:
       labels:
         app: {{ include "common.name" . }}
-        release: {{ .Release.Name }}
+        release: {{ include "common.release" . }}
       name: {{ include "common.name" . }}
     spec:
       initContainers:
diff --git a/components/aai-sparky-be/templates/secret.yaml b/components/aai-sparky-be/templates/secret.yaml
index 6084ca3..292e035 100644
--- a/components/aai-sparky-be/templates/secret.yaml
+++ b/components/aai-sparky-be/templates/secret.yaml
@@ -20,7 +20,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 type: Opaque
 data:
diff --git a/components/aai-sparky-be/templates/service.yaml b/components/aai-sparky-be/templates/service.yaml
index 24ee69d..5c939ae 100644
--- a/components/aai-sparky-be/templates/service.yaml
+++ b/components/aai-sparky-be/templates/service.yaml
@@ -20,7 +20,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
   type: {{ .Values.service.type }}
@@ -35,4 +35,4 @@ spec:
   {{- end}}
   selector:
     app: {{ include "common.name" . }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
diff --git a/components/aai-traversal/templates/configmap.yaml b/components/aai-traversal/templates/configmap.yaml
index 1a92199..08bd2b3 100644
--- a/components/aai-traversal/templates/configmap.yaml
+++ b/components/aai-traversal/templates/configmap.yaml
@@ -20,7 +20,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 data:
 {{ tpl (.Files.Glob "resources/config/logback.xml").AsConfig . | indent 2 }}
@@ -39,7 +39,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 data:
 {{ tpl (.Files.Glob "resources/config/aaf/org.osaaf.location.props").AsConfig . | indent 2 }}
@@ -55,7 +55,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 type: Opaque
 data:
diff --git a/components/aai-traversal/templates/deployment.yaml b/components/aai-traversal/templates/deployment.yaml
index edd349a..0ce5114 100644
--- a/components/aai-traversal/templates/deployment.yaml
+++ b/components/aai-traversal/templates/deployment.yaml
@@ -21,7 +21,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
   replicas: {{ .Values.replicaCount }}
@@ -32,7 +32,7 @@ spec:
     metadata:
       labels:
         app: {{ include "common.name" . }}
-        release: {{ .Release.Name }}
+        release: {{ include "common.release" . }}
       name: {{ include "common.name" . }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
@@ -633,12 +633,12 @@ spec:
         - /root/job_complete.py
         args:
         - --job-name
-        - {{ .Release.Name }}-aai-graphadmin-migration
+        - {{ include "common.release" . }}-aai-graphadmin-migration
       {{  else if .Values.global.jobs.createSchema.enabled  }}
         - /root/job_complete.py
         args:
         - --job-name
-        - {{ .Release.Name }}-aai-graphadmin-create-db-schema
+        - {{ include "common.release" . }}-aai-graphadmin-create-db-schema
       {{  else }}
         - /root/ready.py
         args:
diff --git a/components/aai-traversal/templates/job.yaml b/components/aai-traversal/templates/job.yaml
index 5a49630..92b8614 100644
--- a/components/aai-traversal/templates/job.yaml
+++ b/components/aai-traversal/templates/job.yaml
@@ -23,7 +23,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 {{ if .Values.global.jobs.migration.enabled }}
   annotations:
@@ -36,7 +36,7 @@ spec:
     metadata:
       labels:
         app: {{ include "common.name" . }}-job
-        release: {{ .Release.Name }}
+        release: {{ include "common.release" . }}
       name: {{ include "common.name" . }}
     spec:
       initContainers:
diff --git a/components/aai-traversal/templates/service.yaml b/components/aai-traversal/templates/service.yaml
index d119912..68d767b 100644
--- a/components/aai-traversal/templates/service.yaml
+++ b/components/aai-traversal/templates/service.yaml
@@ -20,7 +20,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
   type: {{ .Values.service.type }}
@@ -40,5 +40,5 @@ spec:
   {{- end}}
   selector:
     app: {{ include "common.name" . }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
   clusterIP: None
diff --git a/templates/configmap.yaml b/templates/configmap.yaml
index 651bf8d..c9cfbef 100644
--- a/templates/configmap.yaml
+++ b/templates/configmap.yaml
@@ -21,7 +21,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 data:
 {{ tpl (.Files.Glob "resources/config/log/filebeat/*").AsConfig . | indent 2 }}
@@ -34,7 +34,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 data:
 {{ if .Values.global.installSidecarSecurity }}
@@ -51,7 +51,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 type: Opaque
 data:
@@ -66,7 +66,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 type: Opaque
 data:
diff --git a/templates/deployment.yaml b/templates/deployment.yaml
index ee21140..b842261 100644
--- a/templates/deployment.yaml
+++ b/templates/deployment.yaml
@@ -21,7 +21,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
   replicas: {{ .Values.replicaCount }}
@@ -29,8 +29,8 @@ spec:
     metadata:
       labels:
         app: {{ include "common.name" . }}
-        release: {{ .Release.Name }}
-      name: {{ .Release.Name }}
+        release: {{ include "common.release" . }}
+      name: {{ include "common.release" . }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
     spec:
diff --git a/templates/secret.yaml b/templates/secret.yaml
index f01f11d..dd8be62 100644
--- a/templates/secret.yaml
+++ b/templates/secret.yaml
@@ -20,7 +20,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 type: Opaque
 data:
diff --git a/templates/service.yaml b/templates/service.yaml
index 28df229..5ee9668 100644
--- a/templates/service.yaml
+++ b/templates/service.yaml
@@ -20,7 +20,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
   ports: