From 9ca9753f16d9f1fbea0f8178ac0f8cecd437aa62 Mon Sep 17 00:00:00 2001 From: dengyh Date: Fri, 9 Oct 2020 11:33:28 +0800 Subject: [PATCH] [MODELING] Refactor Modeling environment variables Issue-ID: MODELING-437 Change-Id: Ie8eba9f0d3e25787b0160e67d19a7d9f079dc717 Signed-off-by: dengyh --- .../charts/modeling-etsicatalog/templates/deployment.yaml | 8 ++++---- kubernetes/modeling/charts/modeling-etsicatalog/values.yaml | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/kubernetes/modeling/charts/modeling-etsicatalog/templates/deployment.yaml b/kubernetes/modeling/charts/modeling-etsicatalog/templates/deployment.yaml index 014013ab7a..52d675a39e 100644 --- a/kubernetes/modeling/charts/modeling-etsicatalog/templates/deployment.yaml +++ b/kubernetes/modeling/charts/modeling-etsicatalog/templates/deployment.yaml @@ -82,12 +82,12 @@ spec: initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }} periodSeconds: {{ .Values.readiness.periodSeconds }} env: - - name: MSB_PROTO - value: "{{ .Values.config.msbProtocol }}" + - name: MSB_ADDR + value: "{{ .Values.config.msbProtocol }}://{{ .Values.config.msbServiceName }}:{{ .Values.config.msbPort }}" - name: SSL_ENABLED value: "{{ .Values.config.ssl_enabled }}" - - name: MSB_ADDR - value: "{{ .Values.config.msbServiceName }}:{{ .Values.config.msbPort }}" + - name: MSB_ENABLED + value: "{{ .Values.config.msb_enabled }}" - name: DB_IP value: "{{ include "common.mariadbService" . }}" - name: DB_PORT diff --git a/kubernetes/modeling/charts/modeling-etsicatalog/values.yaml b/kubernetes/modeling/charts/modeling-etsicatalog/values.yaml index 5926584ef9..9bc8aa0433 100644 --- a/kubernetes/modeling/charts/modeling-etsicatalog/values.yaml +++ b/kubernetes/modeling/charts/modeling-etsicatalog/values.yaml @@ -82,6 +82,7 @@ config: msbProtocol: https msbServiceName: msb-iag msbPort: 443 + msb_enabled: true #application configuration user password about mariadb db: userName: etsicatalog -- 2.16.6