Merge "Add missing naming policy for vFW_NextGen"

[oom.git] / kubernetes / dcaegen2 / charts / dcae-redis / templates / statefulset.yaml

diff --git a/kubernetes/dcaegen2/charts/dcae-redis/templates/statefulset.yaml b/kubernetes/dcaegen2/charts/dcae-redis/templates/statefulset.yaml
index 4724714..5a5b220 100644 (file)
--- a/kubernetes/dcaegen2/charts/dcae-redis/templates/statefulset.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-redis/templates/statefulset.yaml
@@ -35,14 +35,13 @@ spec:
       initContainers:
       containers:
         - name: {{ include "common.name" . }}
-          image: "{{ .Values.repository | default .Values.repository }}/{{ .Values.image }}"
+          image: "{{ include "common.repository" . }}/{{ .Values.image }}"
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
           command:
           - /bin/sh
           - -c
           - |
-            /opt/scripts/redis-cluster-config.sh &
-            /usr/local/bin/redis-server-config.sh
+            /opt/scripts/redis-cluster-config.sh
           ports:
           - containerPort: {{ .Values.service.internalPort }}
             name: {{ .Values.service.name }}
@@ -78,7 +77,7 @@ spec:
           - mountPath: /opt/scripts
             name: {{ include "common.fullname" . }}-scripts
           resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
         {{- if .Values.nodeSelector }}
         nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 10 }}
@@ -114,3 +113,6 @@ spec:
       resources:
         requests:
           storage: {{ .Values.persistence.size }}
+      selector:
+        matchLabels:
+          name: {{ include "common.fullname" . }}