summaryrefslogtreecommitdiffstats
path: root/kubernetes/common/controller-blueprints/templates
diff options
context:
space:
mode:
authorJerome Doucerain <jerome.doucerain@bell.ca>2018-09-21 13:55:52 +0000
committerGerrit Code Review <gerrit@onap.org>2018-09-21 13:55:52 +0000
commit2ddb1640aa71d3114d515d0c912bfdce848e28bd (patch)
tree95b5dbd44b0ad79bc1efd9f7b73efc0bc8f8b818 /kubernetes/common/controller-blueprints/templates
parent885cc2df865888d8f68b218e8fe30f40d62b4fde (diff)
parent43c67e08c6ea24689a6d06a56b601a827a6e912e (diff)
Merge "Add missing properties files to SDNC"
Diffstat (limited to 'kubernetes/common/controller-blueprints/templates')
-rw-r--r--kubernetes/common/controller-blueprints/templates/deployment.yaml10
-rw-r--r--kubernetes/common/controller-blueprints/templates/secrets.yaml2
2 files changed, 12 insertions, 0 deletions
diff --git a/kubernetes/common/controller-blueprints/templates/deployment.yaml b/kubernetes/common/controller-blueprints/templates/deployment.yaml
index fc7329cf9f..18fb16561a 100644
--- a/kubernetes/common/controller-blueprints/templates/deployment.yaml
+++ b/kubernetes/common/controller-blueprints/templates/deployment.yaml
@@ -81,6 +81,16 @@ spec:
secretKeyRef:
name: {{ template "common.fullname" . }}
key: db-root-password
+ - name: MS_USER
+ valueFrom:
+ secretKeyRef:
+ name: {{ template "common.fullname" . }}
+ key: restUser
+ - name: MS_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: {{ template "common.fullname" . }}
+ key: restPassword
- name: INIT_DATA_LOAD
value: {{ .Values.config.initDataLoad | quote }}
- name: STICKYSELECTORKEY
diff --git a/kubernetes/common/controller-blueprints/templates/secrets.yaml b/kubernetes/common/controller-blueprints/templates/secrets.yaml
index 4b11188429..b4ab161809 100644
--- a/kubernetes/common/controller-blueprints/templates/secrets.yaml
+++ b/kubernetes/common/controller-blueprints/templates/secrets.yaml
@@ -25,3 +25,5 @@ metadata:
type: Opaque
data:
db-root-password: {{ index .Values "mariadb-galera" "config" "mariadbRootPassword" | b64enc | quote }}
+ restUser: {{ .Values.config.restUser | b64enc | quote }}
+ restPassword: {{ .Values.config.restPassword | b64enc | quote }}