diff options
| author |   Mike Elliott <mike.elliott@amdocs.com> | 2019-12-04 13:23:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-12-04 13:23:41 +0000 |
| commit | b16e8fe5947741d6c6c7f3458a87a6efa6a22859 (patch) | |
| tree | 3bb7f0d016a10590408659c1b5bff581a62816bf /kubernetes/nbi/templates/deployment.yaml | |
| parent | 6c1984839109f1dea6514998018f7c10f1dae764 (diff) | |
| parent | 1d061a4c38432c7d75c4adfa10b9a0786fa6ed5f (diff) | |
Merge "[NBI] Use the common galera cluster of ONAP"
Diffstat (limited to 'kubernetes/nbi/templates/deployment.yaml')
| -rw-r--r-- | kubernetes/nbi/templates/deployment.yaml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kubernetes/nbi/templates/deployment.yaml b/kubernetes/nbi/templates/deployment.yaml index dc66319e7c..4ba28b0fc0 100644 --- a/kubernetes/nbi/templates/deployment.yaml +++ b/kubernetes/nbi/templates/deployment.yaml @@ -30,7 +30,7 @@ spec: labels: app: {{ include "common.name" . }} release: {{ .Release.Name }} - name: {{ include "common.fullname" . }} + name: {{ include "common.fullname" . }} spec: containers: - name: {{ include "common.name" . }} @@ -54,14 +54,14 @@ spec: periodSeconds: {{ .Values.readiness.periodSeconds }} env: - name: SPRING_DATASOURCE_URL - value: jdbc:mariadb://{{ index .Values "mariadb-galera" "service" "name" }}.{{ include "common.namespace" . }}:3306/{{ index .Values "mariadb-galera" "config" "mysqlDatabase" }} + value: jdbc:mariadb://{{ include "common.mariadbService" . }}:{{ include "common.mariadbPort" . }}/{{ index .Values "mariadb-galera" "config" "mysqlDatabase" }} - name: SPRING_DATASOURCE_USERNAME value: {{ index .Values "mariadb-galera" "config" "userName" }} - name: SPRING_DATASOURCE_PASSWORD valueFrom: secretKeyRef: - name: {{ template "common.fullname" . }}-secret - key: db-user-password + name: {{ include "common.mariadbSecret" . }} + key: {{ include "common.mariadbSecretParam" . }} - name: SPRING_DATA_MONGODB_HOST value: {{ .Values.mongo.service.name }}.{{ include "common.namespace" . }} - name: SPRING_DATA_MONGODB_PORT |