diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-10-26 14:16:23 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-10-26 14:16:23 +0000 |
| commit | 0e4398a4d093fa03cf019650c51a5d07a3bcff67 (patch) | |
| tree | fbf4236e6a294544ec4142efd514e07fd5a04010 | |
| parent | 239a9264ddecd1485f80f0c0df9c363c0cffb9e0 (diff) | |
| parent | d64fec43a8613d62c235a80a4a920e2fff73610e (diff) | |
Merge "[MODELING]Add environment variables in OOM chart"
| -rw-r--r-- | kubernetes/modeling/charts/modeling-etsicatalog/templates/deployment.yaml | 10 | ||||
| -rw-r--r-- | kubernetes/modeling/charts/modeling-etsicatalog/values.yaml | 12 |
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 |