aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/modeling/charts
diff options
context:
space:
mode:
authordengyh <dengyuanhong@chinamobile.com>2020-10-09 11:33:28 +0800
committerdengyh <dengyuanhong@chinamobile.com>2020-10-09 11:33:33 +0800
commit9ca9753f16d9f1fbea0f8178ac0f8cecd437aa62 (patch)
treebea40242a7984710b1b623de55fed818a92ea2d6 /kubernetes/modeling/charts
parentbfe75a346b6ac671723affa5770b4caf4ae7f79a (diff)
[MODELING] Refactor Modeling environment variables
Issue-ID: MODELING-437 Change-Id: Ie8eba9f0d3e25787b0160e67d19a7d9f079dc717 Signed-off-by: dengyh <dengyuanhong@chinamobile.com>
Diffstat (limited to 'kubernetes/modeling/charts')
-rw-r--r--kubernetes/modeling/charts/modeling-etsicatalog/templates/deployment.yaml8
-rw-r--r--kubernetes/modeling/charts/modeling-etsicatalog/values.yaml1
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