X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fcommon%2Fmusic%2Fcharts%2Fzookeeper%2Ftemplates%2Fstatefulset.yaml;h=73224addef3a071319631b8edee047b3a5fb1eee;hb=137d7ccd2597a6492e926818eebab2f6067fb382;hp=9e3549f20d4e989631da4bd590fb840ba45e9197;hpb=6ad3a1c8e3e74c4af3912adf1c982b131c163e77;p=oom.git

diff --git a/kubernetes/common/music/charts/zookeeper/templates/statefulset.yaml b/kubernetes/common/music/charts/zookeeper/templates/statefulset.yaml
index 9e3549f20d..73224addef 100644
--- a/kubernetes/common/music/charts/zookeeper/templates/statefulset.yaml
+++ b/kubernetes/common/music/charts/zookeeper/templates/statefulset.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app: {{ template "common.name" . }}
     chart: {{ .Chart.Name }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
     component: server
 spec:
@@ -25,7 +25,7 @@ spec:
   selector:
     matchLabels:
       app: {{ template "common.name" . }}
-      release: {{ .Release.Name }}
+      release: {{ include "common.release" . }}
       component: server
   updateStrategy:
 {{ toYaml .Values.updateStrategy | indent 4 }}
@@ -33,7 +33,7 @@ spec:
     metadata:
       labels:
         app: {{ template "common.name" . }}
-        release: {{ .Release.Name }}
+        release: {{ include "common.release" . }}
         component: server
       {{- if .Values.podLabels }}
         ## Custom pod labels
@@ -82,7 +82,7 @@ spec:
           resources:
 {{ include "common.resources" . }}
           volumeMounts:
-            - name: zookeeper-data
+            - name: {{ include "common.fullname" . }}-data
               mountPath: /var/lib/zookeeper
 
 {{- if .Values.exporters.jmx.enabled }}
@@ -160,32 +160,23 @@ spec:
         {{- if .Values.exporters.jmx.enabled }}
         - name: config-jmx-exporter
           configMap:
-            name: {{ .Release.Name }}-jmx-exporter
-        {{- end }}
-        {{- if not .Values.persistence.enabled }}
-        - name: zookeeper-data
-          emptyDir: {}
+            name: {{ include "common.release" . }}-jmx-exporter
         {{- end }}
       {{- end }}
   {{- if .Values.persistence.enabled }}
   volumeClaimTemplates:
-    - metadata:
-        name: zookeeper-data
-        labels:
-          app: {{ .Chart.Name }}
-          chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-          release: "{{ .Release.Name }}"
-          heritage: "{{ .Release.Service }}"
-      annotations:
-        volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.storageClass }}
-      spec:
-        storageClassName: {{ .Values.persistence.storageClass }}
-        accessModes:
-          - {{ .Values.persistence.accessMode | quote }}
-        resources:
-          requests:
-            storage: {{ .Values.persistence.size | quote }}
-        selector:
-          matchLabels:
-            release: "{{ .Release.Name }}"
+  - metadata:
+      name: {{ include "common.fullname" . }}-data
+      labels:
+        name: {{ include "common.fullname" . }}
+        chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+        release: "{{ include "common.release" . }}"
+        heritage: "{{ .Release.Service }}"
+    spec:
+      accessModes:
+      - {{ .Values.persistence.accessMode | quote }}
+      storageClassName: {{ include "common.storageClass" . }}
+      resources:
+        requests:
+          storage: {{ .Values.persistence.size | quote }}
   {{- end }}