diff options
| author |   Borislav Glozman <Borislav.Glozman@amdocs.com> | 2019-10-30 14:09:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-10-30 14:09:36 +0000 |
| commit | 83d278baef5b1de142c29935438bac38372fc888 (patch) | |
| tree | 9d5417cc694d23ebff2a0665470146179280cb0d /kubernetes/nbi/templates | |
| parent | 7102af90c8c37f8c9c196d79920453fdc6db2da1 (diff) | |
| parent | 9e851c6cf56379d1c51a39db86d03ff7d1904daf (diff) | |
Merge "[NBI] Use mariadb-galera from common"
Diffstat (limited to 'kubernetes/nbi/templates')
| -rw-r--r-- | kubernetes/nbi/templates/deployment.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/nbi/templates/secrets.yaml | 4 |
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 }} |