summaryrefslogtreecommitdiffstats
path: root/kubernetes/modeling/charts/modeling-etsicatalog
diff options
context:
space:
mode:
authordengyh <dengyuanhong@chinamobile.com>2020-10-26 15:23:42 +0800
committerdengyh <dengyuanhong@chinamobile.com>2020-10-26 15:23:54 +0800
commitd64fec43a8613d62c235a80a4a920e2fff73610e (patch)
treeed834ab60d05b1d6f2b29f0657a0d35d365c2313 /kubernetes/modeling/charts/modeling-etsicatalog
parent951290ba262db65ac7f6cdfb659987cb394916ee (diff)
[MODELING]Add environment variables in OOM chart
Issue-ID: MODELING-441 Change-Id: Ibcabdb9db6f9d0695f2c338a9f7d52b42f6d0723 Signed-off-by: dengyh <dengyuanhong@chinamobile.com>
Diffstat (limited to 'kubernetes/modeling/charts/modeling-etsicatalog')
-rw-r--r--kubernetes/modeling/charts/modeling-etsicatalog/templates/deployment.yaml10
-rw-r--r--kubernetes/modeling/charts/modeling-etsicatalog/values.yaml12
2 files changed, 18 insertions, 4 deletions
diff --git a/kubernetes/modeling/charts/modeling-etsicatalog/templates/deployment.yaml b/kubernetes/modeling/charts/modeling-etsicatalog/templates/deployment.yaml
index bdcd0501ef..347d79401a 100644
--- a/kubernetes/modeling/charts/modeling-etsicatalog/templates/deployment.yaml
+++ b/kubernetes/modeling/charts/modeling-etsicatalog/templates/deployment.yaml
@@ -84,12 +84,18 @@ spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
env:
- - name: MSB_ADDR
- value: "{{ .Values.config.msbProtocol }}://{{ .Values.config.msbServiceName }}:{{ .Values.config.msbPort }}"
- name: SSL_ENABLED
value: "{{ .Values.config.ssl_enabled }}"
- name: MSB_ENABLED
value: "{{ .Values.config.msb_enabled }}"
+ - name: MSB_ADDR
+ value: "{{ .Values.config.msbProtocol }}://{{ .Values.config.msbServiceName }}:{{ .Values.config.msbPort }}"
+ - name: SDC_ADDR
+ value: "{{ .Values.config.sdcProtocol }}://{{ .Values.config.sdcServiceName }}:{{ .Values.config.sdcPort }}"
+ - name: DMAAP_ENABLED
+ value: "{{ .Values.config.dmaap_enabled }}"
+ - name: DMAAP_ADDR
+ value: "{{ .Values.config.dmaapProtocol }}://{{ .Values.config.dmaapServiceName }}:{{ .Values.config.dmaapPort }}"
- 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 9bc8aa0433..9c910badfa 100644
--- a/kubernetes/modeling/charts/modeling-etsicatalog/values.yaml
+++ b/kubernetes/modeling/charts/modeling-etsicatalog/values.yaml
@@ -79,10 +79,18 @@ mariadb-init:
config:
#application configuration about msb
ssl_enabled: false
+ msb_enabled: false
msbProtocol: https
msbServiceName: msb-iag
msbPort: 443
- msb_enabled: true
+ sdcProtocol: https
+ sdcServiceName: sdc-be
+ sdcPort: 8443
+ dmaap_enabled: false
+ dmaapProtocol: https
+ dmaapServiceName: message-router-external
+ dmaapPort: 3905
+
#application configuration user password about mariadb
db:
userName: etsicatalog
@@ -93,7 +101,7 @@ config:
flavor: small
repository: nexus3.onap.org:10001
-image: onap/modeling/etsicatalog:1.0.7
+image: onap/modeling/etsicatalog:1.0.8
initImage: busybox:latest
pullPolicy: Always