(VOL-4959) kafka retry parameters for voltha-go,openonu-adapter,openolt-adapter

Change-Id: I96455e14d007681f4db6e8657be60c06fd234460
Signed-off-by: Akash Reddy Kankanala <akash.kankanala@radisys.com>
diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index 31ab105..1b99825 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -17,7 +17,7 @@
 
 ## Chart version for package 'voltha'
 ##   Increment when Chart.yaml changes
-version: "2.15.0"
+version: "2.15.1"
 
 description: "A Helm chart for Voltha based on K8S resources in Voltha project"
 keywords:
@@ -36,6 +36,6 @@
     url: "https://www.opennetworking.org"
 
 # appVersion refers to release version of voltha-go
-appVersion: "3.6.17"
+appVersion: "3.6.20"
 
 # [EOF]
diff --git a/voltha/templates/core-deploy.yaml b/voltha/templates/core-deploy.yaml
index 12afcdd..1fb5e03 100644
--- a/voltha/templates/core-deploy.yaml
+++ b/voltha/templates/core-deploy.yaml
@@ -105,6 +105,8 @@
             - "--backoff_retry_initial_interval={{ .Values.rw_core.backoff_initial_interval }}"
             - "--backoff_retry_max_interval={{ .Values.rw_core.backoff_max_interval }}"
             - "--backoff_retry_max_elapsed_time={{ .Values.rw_core.backoff_max_elapsed_time }}"
+            - "--producer_retry_max={{ tpl .Values.rw_core.producer_retry_max . }}"
+            - "--metadata_retry_max={{ tpl .Values.rw_core.metadata_retry_max . }}"
           ports:
             - containerPort: 50057
               name: nbi-grpc
diff --git a/voltha/values.yaml b/voltha/values.yaml
index 8712f7e..4d7ab25 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -30,6 +30,8 @@
     rpc_timeout: "30s"
     flow_timeout: "30s"
     internal_timeout: "30s"
+    producer_retry_max: "10"
+    metadata_retry_max: "15"
   # Configure Log Correlation
   log_correlation:
     enabled: true
@@ -95,6 +97,8 @@
   internal_timeout: '{{ .Values.global.rw_core.internal_timeout }}'
   kv_store_data_prefix: 'service/{{ .Values.global.stack_name }}_voltha'
   stack_id: "{{ .Values.global.stack_name }}"
+  producer_retry_max : '{{ .Values.global.rw_core.producer_retry_max }}'
+  metadata_retry_max : '{{ .Values.global.rw_core.metadata_retry_max }}'
   topics:
     event_topic: "voltha.events"
   backoff_initial_interval: 500ms
@@ -119,7 +123,7 @@
   rw_core:
     registry: '{{ .Values.global.image_registry }}'
     repository: '{{ .Values.global.image_org }}voltha-rw-core'
-    tag: '{{- if hasKey .Values.global "image_tag" }}{{- if .Values.global.image_tag }}{{ .Values.global.image_tag }}{{- else }}3.4.8{{- end }}{{- else }}3.4.8{{- end }}'
+    tag: '{{- if hasKey .Values.global "image_tag" }}{{- if .Values.global.image_tag }}{{ .Values.global.rw_core.image_tag }}{{- else }}{{ .Chart.AppVersion }}{{- end }}{{- else }}{{ .Chart.AppVersion }}{{- end }}'
     pullPolicy: '{{ .Values.global.image_pullPolicy }}'
 
 ingress: