Merge "Fix driver startup in OOM"

diff --git a/kubernetes/dmaap/charts/dmaap-data-router/charts/dmaap-dr-node/values.yaml b/kubernetes/dmaap/charts/dmaap-data-router/charts/dmaap-dr-node/values.yaml
index f8600b5..8062a33 100644 (file)
--- a/kubernetes/dmaap/charts/dmaap-data-router/charts/dmaap-dr-node/values.yaml
+++ b/kubernetes/dmaap/charts/dmaap-data-router/charts/dmaap-dr-node/values.yaml
@@ -26,7 +26,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/dmaap/datarouter-node:1.0.2
+image: onap/dmaap/datarouter-node:1.0.3
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/dmaap/charts/dmaap-data-router/charts/dmaap-dr-prov/values.yaml b/kubernetes/dmaap/charts/dmaap-data-router/charts/dmaap-dr-prov/values.yaml
index dfdd38b..25e058d 100644 (file)
--- a/kubernetes/dmaap/charts/dmaap-data-router/charts/dmaap-dr-prov/values.yaml
+++ b/kubernetes/dmaap/charts/dmaap-data-router/charts/dmaap-dr-prov/values.yaml
@@ -27,7 +27,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/dmaap/datarouter-prov:1.0.2
+image: onap/dmaap/datarouter-prov:1.0.3
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py b/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py
index 38bfceb..7450491 100644 (file)
--- a/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py
+++ b/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py
@@ -131,8 +131,8 @@ GLOBAL_SMS_SERVER_PROTOCOL = "https"
 GLOBAL_SMS_SERVER_NAME = "aaf-sms.{{include "common.namespace" .}}"
 GLOBAL_SMS_SERVER_PORT = "10443"
 # vid info - everything is from the private oam network (also called onap private network)
-GLOBAL_VID_SERVER_PROTOCOL = "https"
-GLOBAL_VID_SERVER_PORT = "8443"
+GLOBAL_VID_SERVER_PROTOCOL = "{{ .Values.vidServerProtocol }}"
+GLOBAL_VID_SERVER_PORT = "{{ .Values.vidServerPort }}"
 GLOBAL_VID_USERNAME = "{{ .Values.vidUsername }}"
 GLOBAL_VID_PASSWORD = "{{ .Values.vidPassword}}"
 GLOBAL_VID_HEALTH_USERNAME = "{{ .Values.vidHealthUsername }}"