[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: Ia8cead50d305adb00eef666d0a1ace74479b5183

8 files changed, 18 insertions, 18 deletions

diff --git a/kubernetes/contrib/charts/awx/charts/awx-postgres/templates/deployment.yaml b/kubernetes/contrib/charts/awx/charts/awx-postgres/templates/deployment.yaml
index 3ac0e1a76c..67d13cf477 100755
--- a/kubernetes/contrib/charts/awx/charts/awx-postgres/templates/deployment.yaml
+++ b/kubernetes/contrib/charts/awx/charts/awx-postgres/templates/deployment.yaml
@@ -22,7 +22,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 }}
@@ -30,7 +30,7 @@ spec:
     metadata:
       labels:
         app: {{ include "common.name" . }}
-        release: {{ .Release.Name }}
+        release: {{ include "common.release" . }}
     spec:
       containers:
       - name: {{ include "common.name" . }}
diff --git a/kubernetes/contrib/charts/awx/charts/awx-postgres/templates/pv.yaml b/kubernetes/contrib/charts/awx/charts/awx-postgres/templates/pv.yaml
index da68e3400c..bfe63abafe 100755
--- a/kubernetes/contrib/charts/awx/charts/awx-postgres/templates/pv.yaml
+++ b/kubernetes/contrib/charts/awx/charts/awx-postgres/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" . }}
 spec:
@@ -35,6 +35,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.mountSubPath }}
+    path: {{ .Values.global.persistence.mountPath | default .Values.persistence.mountPath }}/{{ include "common.release" . }}/{{ .Values.persistence.mountSubPath }}
 {{- end -}}
 {{- end -}}
diff --git a/kubernetes/contrib/charts/awx/charts/awx-postgres/templates/pvc.yaml b/kubernetes/contrib/charts/awx/charts/awx-postgres/templates/pvc.yaml
index 6d51a09232..e12dabf175 100755
--- a/kubernetes/contrib/charts/awx/charts/awx-postgres/templates/pvc.yaml
+++ b/kubernetes/contrib/charts/awx/charts/awx-postgres/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 }}"
 {{- if .Values.persistence.annotations }}
   annotations:
diff --git a/kubernetes/contrib/charts/awx/charts/awx-postgres/templates/service.yaml b/kubernetes/contrib/charts/awx/charts/awx-postgres/templates/service.yaml
index 9dffb536ee..f560417425 100755
--- a/kubernetes/contrib/charts/awx/charts/awx-postgres/templates/service.yaml
+++ b/kubernetes/contrib/charts/awx/charts/awx-postgres/templates/service.yaml
@@ -22,7 +22,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 }}
@@ -39,4 +39,4 @@ spec:
     {{- end}}
   selector:
     app: {{ include "common.name" . }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
diff --git a/kubernetes/contrib/charts/awx/charts/awx/templates/job.yaml b/kubernetes/contrib/charts/awx/charts/awx/templates/job.yaml
index dd538ae0ce..4be13fbf88 100644
--- a/kubernetes/contrib/charts/awx/charts/awx/templates/job.yaml
+++ b/kubernetes/contrib/charts/awx/charts/awx/templates/job.yaml
@@ -22,7 +22,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
   backoffLimit: 5
@@ -30,7 +30,7 @@ spec:
     metadata:
       labels:
         app: {{ include "common.name" . }}-mgnt
-        release: {{ .Release.Name }}
+        release: {{ include "common.release" . }}
     spec:
       serviceAccount: {{ include "common.fullname" . }}
       serviceAccountName: {{ include "common.fullname" . }}
diff --git a/kubernetes/contrib/charts/awx/charts/awx/templates/secret.yaml b/kubernetes/contrib/charts/awx/charts/awx/templates/secret.yaml
index 8b504d55cc..642f779214 100644
--- a/kubernetes/contrib/charts/awx/charts/awx/templates/secret.yaml
+++ b/kubernetes/contrib/charts/awx/charts/awx/templates/secret.yaml
@@ -22,7 +22,7 @@ metadata:
   labels:
     app: {{ include "common.fullname" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 data:
   credentials_py: {{ tpl (.Files.Get "resources/config/credentials.py") . | b64enc }}
diff --git a/kubernetes/contrib/charts/awx/charts/awx/templates/service.yaml b/kubernetes/contrib/charts/awx/charts/awx/templates/service.yaml
index ed3fd7274d..10f031da82 100755
--- a/kubernetes/contrib/charts/awx/charts/awx/templates/service.yaml
+++ b/kubernetes/contrib/charts/awx/charts/awx/templates/service.yaml
@@ -22,7 +22,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.rmqmgmt.type }}
@@ -32,7 +32,7 @@ spec:
       name: {{ .Values.service.rmqmgmt.portName }}
   selector:
     app: {{ include "common.fullname" . }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
 ---
 apiVersion: v1
 kind: Service
@@ -42,7 +42,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.web.type }}
@@ -53,7 +53,7 @@ spec:
       name: {{ .Values.service.web.portName }}
   selector:
     app: {{ include "common.fullname" . }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
 ---
 apiVersion: v1
 kind: Service
@@ -63,7 +63,7 @@ metadata:
   labels:
     app: {{ include "common.fullname" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
     type: LoadBalancer
 spec:
@@ -77,4 +77,4 @@ spec:
       name: {{ .Values.service.rabbitmq.amqp.portName }}
   selector:
     app: {{ include "common.fullname" . }}
-    release: {{ .Release.Name }}
\ No newline at end of file
+    release: {{ include "common.release" . }}
\ No newline at end of file
diff --git a/kubernetes/contrib/charts/awx/charts/awx/templates/statefulset.yaml b/kubernetes/contrib/charts/awx/charts/awx/templates/statefulset.yaml
index bf85447b8e..988ac174ae 100644
--- a/kubernetes/contrib/charts/awx/charts/awx/templates/statefulset.yaml
+++ b/kubernetes/contrib/charts/awx/charts/awx/templates/statefulset.yaml
@@ -22,7 +22,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
   podManagementPolicy: OrderedReady
@@ -38,7 +38,7 @@ spec:
       labels:
         app: {{ include "common.fullname" . }}
         name: {{ include "common.name" . }}-web-deploy
-        release: {{ .Release.Name }}
+        release: {{ include "common.release" . }}
         service: django
     spec: