Adding ETCD timeout configuration to olt and onu golang adapters
Change-Id: Icd2715899867d0758f6102904009b66d15d84faf
diff --git a/voltha-adapter-openolt/Chart.yaml b/voltha-adapter-openolt/Chart.yaml
index 37700e7..2b26dda 100644
--- a/voltha-adapter-openolt/Chart.yaml
+++ b/voltha-adapter-openolt/Chart.yaml
@@ -14,7 +14,7 @@
---
apiVersion: "v1"
name: "voltha-adapter-openolt"
-version: "2.7.0-dev"
+version: "2.7.0"
description: "A Helm chart for Voltha OpenOLT Adapter"
keywords:
- "onf"
diff --git a/voltha-adapter-openolt/templates/openolt-deploy.yaml b/voltha-adapter-openolt/templates/openolt-deploy.yaml
index 55feb6d..83da3e8 100644
--- a/voltha-adapter-openolt/templates/openolt-deploy.yaml
+++ b/voltha-adapter-openolt/templates/openolt-deploy.yaml
@@ -94,6 +94,7 @@
- "--core_topic={{ .Values.defaults.topics.core_topic }}"
- "--adapter_topic={{ .Values.defaults.topics.adapter_open_olt_topic }}"
- "--kv_store_address={{ .Values.services.etcd.address }}"
+ - "--kv_store_request_timeout={{ tpl .Values.adapter_open_olt.kv_store_timeout . }}"
- "--log_level={{ $log_level }}"
- "--current_replica={{ .Values.replicas.current_replica }}"
- "--total_replica={{ .Values.replicas.total_replica }}"
diff --git a/voltha-adapter-openolt/values.yaml b/voltha-adapter-openolt/values.yaml
index c0c73ce..d72e734 100644
--- a/voltha-adapter-openolt/values.yaml
+++ b/voltha-adapter-openolt/values.yaml
@@ -22,6 +22,8 @@
image_tag: ~
image_org: "voltha/"
image_pullPolicy: "Always"
+ adapter_open_olt:
+ timeout: "5s"
topics:
core_topic: "rwcore"
adapter_open_olt_topic: "openolt"
@@ -81,6 +83,7 @@
adapter_open_olt:
log_level: '{{ .Values.defaults.log_level }}'
+ kv_store_timeout: '{{ .Values.defaults.adapter_open_olt.timeout }}'
images:
adapter_open_olt:
diff --git a/voltha-adapter-openonu/Chart.yaml b/voltha-adapter-openonu/Chart.yaml
index 7d88f49..d3fb2f6 100644
--- a/voltha-adapter-openonu/Chart.yaml
+++ b/voltha-adapter-openonu/Chart.yaml
@@ -14,7 +14,7 @@
---
apiVersion: "v1"
name: "voltha-adapter-openonu"
-version: "2.6.4"
+version: "2.6.5"
description: "A Helm chart for Voltha OpenONU Adapter"
keywords:
- "onf"
diff --git a/voltha-adapter-openonu/templates/openonu-go-deploy.yaml b/voltha-adapter-openonu/templates/openonu-go-deploy.yaml
index 196b88c..e29a50b 100644
--- a/voltha-adapter-openonu/templates/openonu-go-deploy.yaml
+++ b/voltha-adapter-openonu/templates/openonu-go-deploy.yaml
@@ -91,6 +91,7 @@
- "--olt_adapter_topic={{ .Values.defaults.topics.adapter_open_olt_topic }}"
- "--kv_store_host={{ .Values.services.etcd.service }}"
- "--kv_store_port={{ .Values.services.etcd.port }}"
+ - "--kv_store_request_timeout={{ tpl .Values.adapter_open_onu.kv_store_timeout . }}"
- "--log_level={{ $log_level }}"
- "--probe_port=8080"
- "--accept_incr_evto={{ tpl .Values.adapter_open_onu.incremental_evto_update . }}"
diff --git a/voltha-adapter-openonu/values.yaml b/voltha-adapter-openonu/values.yaml
index e3baff1..47e1da3 100644
--- a/voltha-adapter-openonu/values.yaml
+++ b/voltha-adapter-openonu/values.yaml
@@ -28,6 +28,9 @@
# timeout for deadline for interadapter communication
# should be in format as expected by parseDuration golang.
max_timeout_interadapter_comm: "30s"
+ # kv store timeout
+ adapter_open_onu:
+ timeout: "5s"
topics:
core_topic: "rwcore"
adapter_open_onu_topic: "brcm_openomci_onu"
@@ -68,6 +71,7 @@
log_level: '{{ .Values.defaults.log_level }}'
incremental_evto_update: '{{ .Values.defaults.incremental_evto_update }}'
max_timeout_interadapter_comm: '{{ .Values.defaults.max_timeout_interadapter_comm }}'
+ kv_store_timeout: '{{ .Values.defaults.adapter_open_onu.timeout }}'
images:
adapter_open_onu: