diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-01-07 12:44:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-01-07 12:44:39 +0000 |
| commit | ed0ae6bbf72985a50332a34b147a3bd2c6b25a11 (patch) | |
| tree | a751a743265fcb6608a8fdddbeecc0b37e94117a /kubernetes/common/mariadb-galera/templates/statefulset.yaml | |
| parent | 769eebc4d0069f37625b2ac0a5564287e1163111 (diff) | |
| parent | 01c975b4582a2eeb3ad3d72bb4ae61bc18daaae6 (diff) | |
Merge changes I78e22429,Ic101f384,I8dd4128b
* changes:
Use common secret template in mariadb-galera
Improve common secret template
Add secret template to common templates
Diffstat (limited to 'kubernetes/common/mariadb-galera/templates/statefulset.yaml')
| -rw-r--r-- | kubernetes/common/mariadb-galera/templates/statefulset.yaml | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/kubernetes/common/mariadb-galera/templates/statefulset.yaml b/kubernetes/common/mariadb-galera/templates/statefulset.yaml index c3cb4aaaf4..a9f1fb37b7 100644 --- a/kubernetes/common/mariadb-galera/templates/statefulset.yaml +++ b/kubernetes/common/mariadb-galera/templates/statefulset.yaml @@ -1,4 +1,4 @@ -# Copyright © 2019 Amdocs, Bell Canada, Orange +# Copyright © 2019 Amdocs, Bell Canada, Orange, Samsung Electronics # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -61,19 +61,13 @@ spec: apiVersion: v1 fieldPath: metadata.namespace - name: MYSQL_USER - value: {{ default "" .Values.config.userName | quote }} + {{- include "common.secret.envFromSecret" (dict "global" . "uid" "db-user-credentials" "key" "login") | indent 14}} - name: MYSQL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ template "common.fullname" . }} - key: user-password + {{- include "common.secret.envFromSecret" (dict "global" . "uid" "db-user-credentials" "key" "password") | indent 14}} - name: MYSQL_DATABASE value: {{ default "" .Values.config.mysqlDatabase | quote }} - name: MYSQL_ROOT_PASSWORD - valueFrom: - secretKeyRef: - name: {{ template "common.fullname" . }} - key: db-root-password + {{- include "common.secret.envFromSecret" (dict "global" . "uid" "db-root-password" "key" "password") | indent 14}} ports: - containerPort: {{ .Values.service.internalPort }} name: {{ .Values.service.portName }} |