summaryrefslogtreecommitdiffstats
path: root/kubernetes/nbi/templates
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2019-10-28 15:52:05 +0100
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2019-10-28 17:47:36 +0100
commit9e851c6cf56379d1c51a39db86d03ff7d1904daf (patch)
tree66f8afe2dc2ad099efd551648ad074c80d07ff96 /kubernetes/nbi/templates
parent6516cd5988ce5ef6d63de8b3e3d9890f02bd5791 (diff)
[NBI] Use mariadb-galera from common
Instead of using "homegrown" mariadb chart, move to use the common mariadb-galera chart in order to be aligned with most of the other users of mariadb and eventually to move into the common mariadb galera instance. Change-Id: I0c8ed6adfea0d64f97e7d9378464039915d389c7 Issue-ID: EXTAPI-347 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Diffstat (limited to 'kubernetes/nbi/templates')
-rw-r--r--kubernetes/nbi/templates/deployment.yaml4
-rw-r--r--kubernetes/nbi/templates/secrets.yaml4
2 files changed, 4 insertions, 4 deletions
diff --git a/kubernetes/nbi/templates/deployment.yaml b/kubernetes/nbi/templates/deployment.yaml
index 889e25e623..5223f41c09 100644
--- a/kubernetes/nbi/templates/deployment.yaml
+++ b/kubernetes/nbi/templates/deployment.yaml
@@ -54,9 +54,9 @@ spec:
periodSeconds: {{ .Values.readiness.periodSeconds }}
env:
- name: SPRING_DATASOURCE_URL
- value: jdbc:mariadb://{{ .Values.mariadb.service.name }}.{{ include "common.namespace" . }}:{{.Values.mariadb.service.internalPort }}/{{ .Values.mariadb.config.db.database }}
+ value: jdbc:mariadb://{{ index .Values "mariadb-galera" "service" "name" }}.{{ include "common.namespace" . }}:3306/{{ index .Values "mariadb-galera" "config" "mysqlDatabase" }}
- name: SPRING_DATASOURCE_USERNAME
- value: {{ .Values.mariadb.config.db.user }}
+ value: {{ index .Values "mariadb-galera" "config" "userName" }}
- name: SPRING_DATASOURCE_PASSWORD
valueFrom:
secretKeyRef:
diff --git a/kubernetes/nbi/templates/secrets.yaml b/kubernetes/nbi/templates/secrets.yaml
index c29cb1cf0e..ea6ae8296e 100644
--- a/kubernetes/nbi/templates/secrets.yaml
+++ b/kubernetes/nbi/templates/secrets.yaml
@@ -24,5 +24,5 @@ metadata:
heritage: {{ .Release.Service }}
type: Opaque
data:
- db-user-password: {{ .Values.mariadb.config.db.password | b64enc | quote }}
- db-root-password: {{ .Values.mariadb.config.db.root_password | b64enc | quote }}
+ db-user-password: {{ index .Values "mariadb-galera" "config" "userPassword" | b64enc | quote }}
+ db-root-password: {{ index .Values "mariadb-galera" "config" "mariadbRootPassword" | b64enc | quote }}