Bump version of readiness image

[oom.git] / kubernetes / common / music / charts / zookeeper / templates / statefulset.yaml

diff --git a/kubernetes/common/music/charts/zookeeper/templates/statefulset.yaml b/kubernetes/common/music/charts/zookeeper/templates/statefulset.yaml
index 1efd466..73224ad 100644 (file)
--- 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
@@ -58,7 +58,7 @@ spec:
 
         - name: zookeeper
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.image.pullPolicy }}
           command:
             - /bin/bash
             - -xec
@@ -82,13 +82,13 @@ spec:
           resources:
 {{ include "common.resources" . }}
           volumeMounts:
-            - name: zookeeper-data
+            - name: {{ include "common.fullname" . }}-data
               mountPath: /var/lib/zookeeper
 
 {{- if .Values.exporters.jmx.enabled }}
         - name: jmx-exporter
           image: "{{ .Values.exporters.jmx.image.repository }}:{{ .Values.exporters.jmx.image.tag }}"
-          imagePullPolicy: {{ .Values.exporters.jmx.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.exporters.jmx.image.pullPolicy }}
           ports:
   {{- range $key, $port := .Values.exporters.jmx.ports }}
             - name: {{ $key }}
@@ -118,7 +118,7 @@ spec:
 {{- if .Values.exporters.zookeeper.enabled }}
         - name: zookeeper-exporter
           image: "{{ .Values.exporters.zookeeper.image.repository }}:{{ .Values.exporters.zookeeper.image.tag }}"
-          imagePullPolicy: {{ .Values.exporters.zookeeper.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.exporters.zookeeper.image.pullPolicy }}
           args:
             - -bind-addr=:{{ .Values.exporters.zookeeper.ports.zookeeperxp.containerPort }}
             - -metrics-path={{ .Values.exporters.zookeeper.path }}
@@ -160,29 +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 }}
+  - 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 }}