From 43c67e08c6ea24689a6d06a56b601a827a6e912e Mon Sep 17 00:00:00 2001 From: Alexis de Talhouët Date: Thu, 20 Sep 2018 16:49:16 -0400 Subject: Add missing properties files to SDNC MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Missing netbox and blueprint-rest-adaptor Change-Id: Ifa4f2095190718ae8dc3412eac99ae242978c97e Issue-ID: CCSDK-589 Signed-off-by: Alexis de Talhouët --- .../common/controller-blueprints/templates/deployment.yaml | 10 ++++++++++ kubernetes/common/controller-blueprints/templates/secrets.yaml | 2 ++ 2 files changed, 12 insertions(+) (limited to 'kubernetes/common/controller-blueprints/templates') 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 }} -- cgit 1.2.3-korg