summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryangyan <yangyanyj@chinamobile.com>2018-04-13 12:16:40 +0800
committeryangyan <yangyanyj@chinamobile.com>2018-04-18 09:11:11 +0800
commit1c0529987d19b596b44caf2071e121e3e3d2daea (patch)
tree1a06c2db170d559232e0cd0ea082ffd5b9774631
parent8cb27a420a63aa864543d207754d90816eb713fa (diff)
Update vfc charts configutation
Change-Id: I79dc1c5d26692fe675ca4cf2779fc78eac557a45 Issue-ID: VFC-879 Signed-off-by: yangyan <yangyanyj@chinamobile.com>
-rw-r--r--kubernetes/vfc/charts/vfc-ems-driver/templates/deployment.yaml4
-rw-r--r--kubernetes/vfc/charts/vfc-ems-driver/values.yaml6
-rw-r--r--kubernetes/vfc/charts/vfc-huawei-vnfm-driver/templates/deployment.yaml1
3 files changed, 10 insertions, 1 deletions
diff --git a/kubernetes/vfc/charts/vfc-ems-driver/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-ems-driver/templates/deployment.yaml
index ba33ec587d..287f0a7d3e 100644
--- a/kubernetes/vfc/charts/vfc-ems-driver/templates/deployment.yaml
+++ b/kubernetes/vfc/charts/vfc-ems-driver/templates/deployment.yaml
@@ -69,6 +69,10 @@ spec:
env:
- name: MSB_ADDR
value: "{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}"
+ - name: VES_ADDR
+ value: "{{ .Values.config.vescollectorServiceName }}:{{ .Values.config.vescollectorPort }}"
+ - name: VES_AUTHINFO
+ value: "{{ .Values.config.vescollectorUser }}:{{ .Values.config.vescollectorPassword }}"
resources:
{{ toYaml .Values.resources | indent 12 }}
{{- if .Values.nodeSelector }}
diff --git a/kubernetes/vfc/charts/vfc-ems-driver/values.yaml b/kubernetes/vfc/charts/vfc-ems-driver/values.yaml
index d73a72b17b..c44fc75b0c 100644
--- a/kubernetes/vfc/charts/vfc-ems-driver/values.yaml
+++ b/kubernetes/vfc/charts/vfc-ems-driver/values.yaml
@@ -35,7 +35,11 @@ pullPolicy: Always
debugEnabled: false
# application configuration
-config: {}
+config:
+ vescollectorServiceName: dcae-ves-collector
+ vescollectorPort: 8080
+ vescollectorUser: ""
+ vescollectorPassword: ""
# default number of instances
replicaCount: 1
diff --git a/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/templates/deployment.yaml
index eed1906d26..28b5950b48 100644
--- a/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/templates/deployment.yaml
+++ b/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/templates/deployment.yaml
@@ -52,6 +52,7 @@ spec:
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports:
- containerPort: {{ .Values.service.internalPort }}
+ - containerPort: {{ .Values.service.internalPort2 }}
# disable liveness probe when breakpoints set in debugger
# so K8s doesn't restart unresponsive container
{{ if .Values.liveness.enabled }}