diff options
| author |   Krzysztof Opasiak <k.opasiak@samsung.com> | 2020-03-24 21:44:00 +0100 |
|---|---|---|
| committer | Krzysztof Opasiak <k.opasiak@samsung.com> | 2020-03-25 00:50:53 +0100 |
| commit | 0be83cbe4d8fea4d329c3597d44c522758fea4d7 (patch) | |
| tree | 6c448b5dbaffaed7c7d466d142afda16384e4709 /kubernetes/so/charts/so-monitoring/templates/deployment.yaml | |
| parent | 587b6e662a8b9c4d662444783e40247d6b145c6a (diff) | |
[SO] Use common secret template in so-monitoring
Use common secret template in so-monitoring component.
For now passwords are stil hardcoded but this will be removed in
further commits.
Issue-ID: OOM-2328
Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>
Change-Id: Iff0ae7e14924d5e4e3484e509a7a4962f623e487
Diffstat (limited to 'kubernetes/so/charts/so-monitoring/templates/deployment.yaml')
| -rw-r--r-- | kubernetes/so/charts/so-monitoring/templates/deployment.yaml | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/kubernetes/so/charts/so-monitoring/templates/deployment.yaml b/kubernetes/so/charts/so-monitoring/templates/deployment.yaml index 9afcddde36..93b0efb801 100644 --- a/kubernetes/so/charts/so-monitoring/templates/deployment.yaml +++ b/kubernetes/so/charts/so-monitoring/templates/deployment.yaml @@ -65,25 +65,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 }} envFrom: - configMapRef: name: {{ include "common.fullname" . }}-configmap @@ -119,5 +107,3 @@ spec: name: {{ include "common.fullname" . }}-app-configmap imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" - - |