diff options
author | 2020-03-25 12:26:02 +0000 | |
---|---|---|
committer | 2020-03-25 12:26:02 +0000 | |
commit | 1f16295a62f87c0ef4d140d3af341b6f132227a6 (patch) | |
tree | dba9b7bb46c8699ca41e6ce6f12b156d3da9369a /kubernetes/so/charts/so-monitoring/templates/deployment.yaml | |
parent | 35b3735e2fc46ec509e4c21546b0e5b3cabcece0 (diff) | |
parent | 0be83cbe4d8fea4d329c3597d44c522758fea4d7 (diff) |
Merge "[SO] Use common secret template in so-monitoring"
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" - - |