summaryrefslogtreecommitdiffstats
path: root/kubernetes/nbi/templates
diff options
context:
space:
mode:
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 }}