Merge "[RIC-816] install script to support "optional components""

diff --git a/helm/dbaas/templates/appconfig.yaml b/helm/dbaas/templates/appconfig.yaml
index a26e352..52508d4 100644 (file)
--- a/helm/dbaas/templates/appconfig.yaml
+++ b/helm/dbaas/templates/appconfig.yaml
@@ -33,6 +33,9 @@ data:
 {{- if $.Values.dbaas.enableHighAvailability }}
   DBAAS_SERVICE_SENTINEL_PORT: {{ include "common.serviceport.dbaas.sentinel" . | quote }}
   DBAAS_MASTER_NAME: {{ $.Values.dbaas.redis.masterGroupName }}
+  DBAAS_NODE_COUNT: {{ $.Values.dbaas.haReplicas | quote }}
+{{- else }}
+  DBAAS_NODE_COUNT: {{ $.Values.dbaas.saReplicas | quote }}
 {{- end }}
   DBAAS_SERVICE_HOST: {{ include "common.servicename.dbaas.tcp" $ }}.{{ $platformNameSpace }}
   DBAAS_SERVICE_PORT: {{ include "common.serviceport.dbaas.redis" $ | quote }}

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