diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-05-05 06:22:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-05-05 06:22:17 +0000 |
| commit | 32c2ebb4a84e4cc9ae6b31a45d3f2a103cf9d8a6 (patch) | |
| tree | bf3e064246d64fea235f08fb6c62c1168df400bc /kubernetes/clamp/charts/clamp-backend/templates/deployment.yaml | |
| parent | 180578d41ed15c8e349faa943fa82bf41a145779 (diff) | |
| parent | 26df3202534721dc7ed6e3c2b9c4a973502cc7cd (diff) | |
Merge "remove hardcoded MariaDB password"
Diffstat (limited to 'kubernetes/clamp/charts/clamp-backend/templates/deployment.yaml')
| -rw-r--r-- | kubernetes/clamp/charts/clamp-backend/templates/deployment.yaml | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/kubernetes/clamp/charts/clamp-backend/templates/deployment.yaml b/kubernetes/clamp/charts/clamp-backend/templates/deployment.yaml index fa00ffed1a..5e473bc12e 100644 --- a/kubernetes/clamp/charts/clamp-backend/templates/deployment.yaml +++ b/kubernetes/clamp/charts/clamp-backend/templates/deployment.yaml @@ -78,11 +78,17 @@ spec: name: {{ include "common.fullname" . }}-config subPath: sdc-controllers-config.json env: - - name: SPRING_APPLICATION_JSON - valueFrom: - configMapKeyRef: - name: {{ template "common.fullname" . }} - key: spring_application_json + - name: MYSQL_USER + {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "db-secret" "key" "login") | indent 12 }} + - name: MYSQL_PASSWORD + {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "db-secret" "key" "password") | indent 12 }} + - name: MYSQL_DATABASE + value: {{ tpl .Values.db.databaseName .}} + - name: SPRING_APPLICATION_JSON + valueFrom: + configMapKeyRef: + name: {{ template "common.fullname" . }} + key: spring_application_json resources: {{ include "common.resources" . | indent 12 }} {{- if .Values.nodeSelector }} |