Merge "Fix problem with wrong volume mount names"

[oom.git] / kubernetes / dmaap / components / dmaap-dr-node / templates / statefulset.yaml

diff --git a/kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml b/kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml
index f6e7c4e..edb3a2a 100644 (file)
--- a/kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml
@@ -19,7 +19,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 }}
@@ -28,7 +28,7 @@ spec:
     metadata:
       labels:
         app: {{ include "common.name" . }}
-        release: {{ .Release.Name }}
+        release: {{ include "common.release" . }}
     spec:
       initContainers:
         - name: {{ include "common.name" . }}-readiness
@@ -174,12 +174,12 @@ spec:
         - name:  {{ include "common.fullname" . }}-logs
           emptyDir: {}
       {{- if not .Values.persistence.enabled }}
-        - name:  {{ include "common.fullname" . }}-event-logs-pvc
+        - name:  {{ include "common.fullname" . }}-event-logs
           emptyDir: {}
         - name: {{ include "common.fullname" . }}-data
           emptyDir: {}
       {{- if .Values.global.aafEnabled }}
-        - name:  {{ include "common.fullname" . }}-aaf-props-pvc
+        - name:  {{ include "common.fullname" . }}-aaf-props
           emptyDir: {}
       {{- end }}
       {{- end }}