diff options
author | Mandeep Khinda <Mandeep.Khinda@amdocs.com> | 2018-04-24 03:14:59 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2018-04-24 03:14:59 +0000 |
commit | b2e4ea650381d9e109c23a9fe51980655500fb29 (patch) | |
tree | 13291bad52d27121ecda501402058f1b60c59472 | |
parent | 8f72e1e58c389603efa0aa2ae178e1cf3218a2b7 (diff) | |
parent | 1c0529987d19b596b44caf2071e121e3e3d2daea (diff) |
Merge "Update vfc charts configutation"
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 5ddd22c7b6..a8fd22eac5 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 }} |