commit edefccb6bb85109234c02916a65b8cc73583d392
author Neha Sharma <neha.sharma70@infosys.com> Wed Jun 24 13:12:48 2020 +0000
committer Andrea Campanella <andrea@opennetworking.org> Thu Jul 23 15:13:02 2020 +0200
tree e23dfb0bd38e04e686834b4f71f0983cf4d8479f
parent 1631c421ba7428eec6f3b043b2515311cd60122b

[VOL-3261]host and port should be specified as a single argument in voltha-helm-charts

Change-Id: Iae1c0ffbfaef6465bc53556b06c44ec7d92574d3

voltha-adapter-openolt/Chart.yaml

diff --git a/voltha-adapter-openolt/Chart.yaml b/voltha-adapter-openolt/Chart.yaml
index 15a990b..3e6adfd 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.5.6"
+version: "2.5.8"
 description: "A Helm chart for Voltha OpenOLT Adapter"
 keywords:
   - "onf"

voltha-adapter-openolt/templates/openolt-deploy.yaml

diff --git a/voltha-adapter-openolt/templates/openolt-deploy.yaml b/voltha-adapter-openolt/templates/openolt-deploy.yaml
index 41ba36f..99007b0 100644
--- a/voltha-adapter-openolt/templates/openolt-deploy.yaml
+++ b/voltha-adapter-openolt/templates/openolt-deploy.yaml
@@ -89,11 +89,11 @@
               value: {{ .Values.defaults.kv_store_data_prefix }}
           args:
             - "/app/openolt"
-            - "--kafka_adapter_address={{ .Values.services.kafka.adapter.service }}:{{ .Values.services.kafka.adapter.port }}"
-            - "--kafka_cluster_address={{ .Values.services.kafka.cluster.service }}:{{ .Values.services.kafka.cluster.port }}"
+            - "--kafka_adapter_address={{ .Values.services.kafka.adapter.address }}"
+            - "--kafka_cluster_address={{ .Values.services.kafka.cluster.address }}"
             - "--core_topic={{ .Values.defaults.topics.core_topic }}"
             - "--adapter_topic={{ .Values.defaults.topics.adapter_open_olt_topic }}"
-            - "--kv_store_address={{ .Values.services.etcd.service }}:{{ .Values.services.etcd.port }}"
+            - "--kv_store_address={{ .Values.services.etcd.address }}"
             - "--log_level={{ $log_level }}"
             - "--current_replica={{ .Values.replicas.current_replica }}"
             - "--total_replica={{ .Values.replicas.total_replica }}"

voltha-adapter-openolt/values.yaml

diff --git a/voltha-adapter-openolt/values.yaml b/voltha-adapter-openolt/values.yaml
index 1d027d7..cc953f9 100644
--- a/voltha-adapter-openolt/values.yaml
+++ b/voltha-adapter-openolt/values.yaml
@@ -48,16 +48,13 @@
 services:
   kafka:
     adapter:
-      service: kafka
-      port: 9092
+      address: kafka:9092
     cluster:
-      service: kafka
-      port: 9092
+      address: kafka:9092
 
   # Define connectivity to etcd
   etcd:
-    service: etcd
-    port: 2379
+    address: etcd:2379
 
 # Expose the golang pprof webserver, if enabled
 profiler: