diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-03-26 08:04:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-03-26 08:04:10 +0000 |
| commit | 75be7058a167a603be92aa2de4e027dbe4780a90 (patch) | |
| tree | d3eea46d7cfde75e96b15a2f16ef99c7af81589a /kubernetes/so/charts/so-sdc-controller/templates/deployment.yaml | |
| parent | 78942175bc10ad05bd7b2005accaa9ea78a0cdb8 (diff) | |
| parent | c34ed608236f2c4b0df54538d7e0840bffd8c012 (diff) | |
Merge "[SO] Use common secret template in so-sdc-controller"
Diffstat (limited to 'kubernetes/so/charts/so-sdc-controller/templates/deployment.yaml')
| -rwxr-xr-x | kubernetes/so/charts/so-sdc-controller/templates/deployment.yaml | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/kubernetes/so/charts/so-sdc-controller/templates/deployment.yaml b/kubernetes/so/charts/so-sdc-controller/templates/deployment.yaml index c0ac078039..ca6be72273 100755 --- a/kubernetes/so/charts/so-sdc-controller/templates/deployment.yaml +++ b/kubernetes/so/charts/so-sdc-controller/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.envFromSecretFast" (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.envFromSecretFast" (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.envFromSecretFast" (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.envFromSecretFast" (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 |