[VOL-3173] Passing the defaults.rw_core.timeout parameter to voltha-rw-core

Change-Id: I3ebb68fdb28b0cac955fcd7be2a240710c513097
diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index 293aee9..8f0eeb8 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -14,7 +14,7 @@
 # limitations under the License.
 apiVersion: "v1"
 name: "voltha"
-version: "2.4.9"
+version: "2.4.10"
 description: "A Helm chart for Voltha based on K8S resources in Voltha project"
 keywords:
   - "onf"
diff --git a/voltha/templates/core-deploy.yaml b/voltha/templates/core-deploy.yaml
index 6ce8406..3dfb922 100644
--- a/voltha/templates/core-deploy.yaml
+++ b/voltha/templates/core-deploy.yaml
@@ -90,9 +90,9 @@
             - "-kafka_cluster_port={{ .Values.services.kafka.cluster.port }}"
             - "-rw_core_topic={{ .Values.defaults.topics.core_topic }}"
             - "-in_competing_mode=false"
-            - "-core_timeout=10s"
-            - "-timeout_long_request=10s"
-            - "-timeout_request=10s"
+            - "-core_timeout={{ tpl .Values.rw_core.core_timeout . }}"
+            - "-timeout_long_request={{ tpl .Values.rw_core.timeout_long_request . }}"
+            - "-timeout_request={{ tpl .Values.rw_core.timeout_request . }}"
             - "-log_level={{ $log_level }}"
             - "-probe_port=8080"
           ports:
diff --git a/voltha/values.yaml b/voltha/values.yaml
index cb2b9e1..cba138c 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -23,12 +23,12 @@
   image_tag: ~
   image_pullPolicy: "Always"
   rw_core:
-    timeout: "8000"
+    timeout: "10s"
   topics:
     core_topic: "rwcore"
-    
+
   # Define prefix path for etcd
-  # If you're running multiple voltha stacks the this value 
+  # If you're running multiple voltha stacks the this value
   # should be unique across the stacks.
   kv_store_data_prefix: "service/voltha"