Merge "Define configmap data as dbaas and sentinel container environment"

diff --git a/helm/dbaas/templates/statefulset.yaml b/helm/dbaas/templates/statefulset.yaml
index 25faf7d..9e682e3 100644 (file)
--- a/helm/dbaas/templates/statefulset.yaml
+++ b/helm/dbaas/templates/statefulset.yaml
@@ -121,6 +121,9 @@ spec:
         ports:
         - name: redis
           containerPort: {{ include "common.serviceport.dbaas.redis" . }}
+        envFrom:
+        - configMapRef:
+            name: {{ include "common.configmapname.dbaas" . }}-appconfig
         volumeMounts:
         - mountPath: /data
 {{- if $.Values.dbaas.enableHighAvailability }}
@@ -152,6 +155,9 @@ spec:
         ports:
           - name: sentinel
             containerPort: {{ include "common.serviceport.dbaas.sentinel" . }}
+        envFrom:
+        - configMapRef:
+            name: {{ include "common.configmapname.dbaas" . }}-appconfig
         volumeMounts:
         - mountPath: /data
           name: data