Merge "changing portal liveness/readiness probe"

diff --git a/kubernetes/vfc/charts/vfc-ems-driver/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-ems-driver/templates/deployment.yaml
index ba33ec5..287f0a7 100644 (file)
--- 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 5ddd22c..a8fd22e 100644 (file)
--- 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 eed1906..28b5950 100644 (file)
--- 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 }}

diff --git a/kubernetes/vid/values.yaml b/kubernetes/vid/values.yaml
index ac68f2e..7cf2243 100644 (file)
--- a/kubernetes/vid/values.yaml
+++ b/kubernetes/vid/values.yaml
@@ -28,7 +28,7 @@ subChartsOnly:
 
 # application image
 repository: nexus3.onap.org:10001
-image: openecomp/vid:v1.1.1
+image: onap/vid:1.2.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required