diff options
author | 2020-03-06 13:34:27 +0000 | |
---|---|---|
committer | 2020-03-06 13:34:27 +0000 | |
commit | 6b1558231f6cea87e2ef1908d01dd9ba91485a64 (patch) | |
tree | db8739f082c6e2987403b2894460c9ab1cc76683 /kubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml | |
parent | a6e491341ca10f98cac6fbae3505825025e1e681 (diff) | |
parent | 72018dfe6650e38a07a5b2bdf7d3f8f4c6fa111d (diff) |
Merge "[SO] Use common secret template in so-catalog-db-adapter"
Diffstat (limited to 'kubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml')
-rwxr-xr-x | kubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/kubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml b/kubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml index 91e9be6376..63a10b0d83 100755 --- a/kubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml +++ b/kubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml @@ -66,25 +66,13 @@ spec: name: {{ include "common.release" . }}-so-db-secrets key: mariadb.readwrite.port - name: DB_USERNAME - valueFrom: - secretKeyRef: - name: {{ include "common.release" . }}-so-db-secrets - key: mariadb.readwrite.rolename + {{- include "common.secret.envFromSecret" (dict "global" . "uid" "db-user-creds" "key" "login") | indent 10 }} - name: DB_PASSWORD - valueFrom: - secretKeyRef: - name: {{ include "common.release" . }}-so-db-secrets - key: mariadb.readwrite.password + {{- include "common.secret.envFromSecret" (dict "global" . "uid" "db-user-creds" "key" "password") | indent 10 }} - name: DB_ADMIN_USERNAME - valueFrom: - secretKeyRef: - name: {{ include "common.release" . }}-so-db-secrets - key: mariadb.admin.rolename + {{- include "common.secret.envFromSecret" (dict "global" . "uid" "db-admin-creds" "key" "login") | indent 10 }} - name: DB_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - name: {{ include "common.release" . }}-so-db-secrets - key: mariadb.admin.password + {{- include "common.secret.envFromSecret" (dict "global" . "uid" "db-admin-creds" "key" "password") | indent 10 }} {{- if eq .Values.global.security.aaf.enabled true }} - name: TRUSTSTORE value: /app/org.onap.so.trust.jks |