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/templates/core-deploy.yaml

diff --git a/voltha/templates/core-deploy.yaml b/voltha/templates/core-deploy.yaml
index f6ae94f..5b126ea 100644
--- a/voltha/templates/core-deploy.yaml
+++ b/voltha/templates/core-deploy.yaml
@@ -86,11 +86,11 @@
           args:
             - "/app/rw_core"
             - "--kv_store_type=etcd"
-            - "--kv_store_address={{ .Values.services.etcd.service }}:{{ .Values.services.etcd.port }}"
+            - "--kv_store_address={{ .Values.services.etcd.address }}"
             - "--grpc_address=0.0.0.0:50057"
             - "--banner"
-            - "--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 }}"
             - "--rw_core_topic={{ .Values.defaults.topics.core_topic }}"
             - "--core_timeout={{ tpl .Values.rw_core.core_timeout . }}"
             - "--timeout_long_request={{ tpl .Values.rw_core.timeout_long_request . }}"

voltha/templates/ofagent-deploy.yaml

diff --git a/voltha/templates/ofagent-deploy.yaml b/voltha/templates/ofagent-deploy.yaml
index 6149b9c..d0e5715 100644
--- a/voltha/templates/ofagent-deploy.yaml
+++ b/voltha/templates/ofagent-deploy.yaml
@@ -79,10 +79,10 @@
         args:
         - "/app/ofagent"
         {{- range .Values.services.controller }}
-        - "--controller={{ .service }}:{{ .port }}"
+        - "--controller={{ .address }}"
         {{- end }}
         - "--voltha={{ template "fullname" . }}-api.{{ .Release.Namespace }}.svc:55555"
-        - "--kv_store_address={{ .Values.services.etcd.service }}:{{ .Values.services.etcd.port }}"
+        - "--kv_store_address={{ .Values.services.etcd.address }}"
         - "--kv_store_type=etcd"
         - "--kv_store_request_timeout=60s"
         - "--log_level={{ $log_level }}"