J release changes

[ric-plt/ric-dep.git] / helm / dbaas / templates / statefulset.yaml

diff --git a/helm/dbaas/templates/statefulset.yaml b/helm/dbaas/templates/statefulset.yaml
index 4d1593e..9e682e3 100644 (file)
--- a/helm/dbaas/templates/statefulset.yaml
+++ b/helm/dbaas/templates/statefulset.yaml
@@ -107,7 +107,7 @@ spec:
             command: 
             - /bin/sh
             - -c
-            - timeout -t {{ .Values.dbaas.probeTimeout }} redis-cli -p {{ include "common.serviceport.dbaas.redis" . }} ping
+            - {{ .Values.dbaas.probeTimeoutCommand }} {{ .Values.dbaas.probeTimeout }} redis-cli -p {{ include "common.serviceport.dbaas.redis" . }} ping
           initialDelaySeconds: 15
           periodSeconds: 5
         readinessProbe:
@@ -115,12 +115,15 @@ spec:
             command: 
             - /bin/sh
             - -c
-            - timeout -t {{ .Values.dbaas.probeTimeout }} redis-cli -p {{ include "common.serviceport.dbaas.redis" . }} ping
+            - {{ .Values.dbaas.probeTimeoutCommand }} {{ .Values.dbaas.probeTimeout }} redis-cli -p {{ include "common.serviceport.dbaas.redis" . }} ping
           initialDelaySeconds: 15
           periodSeconds: 5
         ports:
         - name: redis
           containerPort: {{ include "common.serviceport.dbaas.redis" . }}
+        envFrom:
+        - configMapRef:
+            name: {{ include "common.configmapname.dbaas" . }}-appconfig
         volumeMounts:
         - mountPath: /data
 {{- if $.Values.dbaas.enableHighAvailability }}
@@ -138,7 +141,7 @@ spec:
             command: 
             - /bin/sh
             - -c
-            - timeout -t {{ .Values.dbaas.probeTimeout }} redis-cli -p {{ include "common.serviceport.dbaas.redis" . }} ping
+            - {{ .Values.dbaas.probeTimeoutCommand }} {{ .Values.dbaas.probeTimeout }} redis-cli -p {{ include "common.serviceport.dbaas.redis" . }} ping
           initialDelaySeconds: 15
           periodSeconds: 5
         readinessProbe:
@@ -146,12 +149,15 @@ spec:
             command: 
             - /bin/sh
             - -c
-            - timeout -t {{ .Values.dbaas.probeTimeout }} redis-cli -p {{ include "common.serviceport.dbaas.redis" . }} ping
+            - {{ .Values.dbaas.probeTimeoutCommand }} {{ .Values.dbaas.probeTimeout }} redis-cli -p {{ include "common.serviceport.dbaas.redis" . }} ping
           initialDelaySeconds: 15
           periodSeconds: 5
         ports:
           - name: sentinel
             containerPort: {{ include "common.serviceport.dbaas.sentinel" . }}
+        envFrom:
+        - configMapRef:
+            name: {{ include "common.configmapname.dbaas" . }}-appconfig
         volumeMounts:
         - mountPath: /data
           name: data