[VOL-3783] Unifying services address and port in openonu-adapter
Change-Id: If74294fa57bc6c2c117ecffd8b9534ded54fc35c
diff --git a/voltha-adapter-openonu/Chart.yaml b/voltha-adapter-openonu/Chart.yaml
index cd423f8..6095dea 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.7.4"
+version: "2.7.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 14519f3..57cc639 100644
--- a/voltha-adapter-openonu/templates/openonu-go-deploy.yaml
+++ b/voltha-adapter-openonu/templates/openonu-go-deploy.yaml
@@ -83,14 +83,11 @@
- "/app/openonu"
- "--banner=true"
- "--kafka_reconnect_retries=-1"
- - "--kafka_adapter_host={{ tpl .Values.services.kafka.adapter.service . }}"
- - "--kafka_adapter_port={{ .Values.services.kafka.adapter.port }}"
- - "--kafka_cluster_host={{ tpl .Values.services.kafka.cluster.service . }}"
- - "--kafka_cluster_port={{ .Values.services.kafka.cluster.port }}"
+ - "--kafka_adapter_address={{ tpl .Values.services.kafka.adapter.address . }}"
+ - "--kafka_cluster_address={{ tpl .Values.services.kafka.cluster.address . }}"
- "--core_topic={{ tpl .Values.adapter_open_onu.topics.core_topic . }}"
- "--adapter_topic={{ tpl .Values.adapter_open_onu.topics.adapter_open_onu_topic . }}"
- - "--kv_store_host={{ tpl .Values.services.etcd.service . }}"
- - "--kv_store_port={{ .Values.services.etcd.port }}"
+ - "--kv_store_address={{ tpl .Values.services.etcd.address . }}"
- "--kv_store_request_timeout={{ tpl .Values.adapter_open_onu.kv_store_timeout . }}"
- "--log_level={{ $log_level }}"
- "--probe_port=8080"
diff --git a/voltha-adapter-openonu/values.yaml b/voltha-adapter-openonu/values.yaml
index 7690a9e..7719422 100644
--- a/voltha-adapter-openonu/values.yaml
+++ b/voltha-adapter-openonu/values.yaml
@@ -53,16 +53,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
# Define Tracing Agent connection details
tracing_agent:
@@ -110,5 +107,5 @@
adapter_open_onu_go:
registry: '{{ .Values.global.image_registry }}'
repository: '{{ .Values.global.image_org }}voltha-openonu-adapter-go'
- tag: '{{- if hasKey .Values.global "image_tag" }}{{- if .Values.global.image_tag }}{{ .Values.global.image_tag }}{{- else }}1.1.1{{- end }}{{- else }}1.1.1{{- end }}'
+ tag: '{{- if hasKey .Values.global "image_tag" }}{{- if .Values.global.image_tag }}{{ .Values.global.image_tag }}{{- else }}1.2.0{{- end }}{{- else }}1.2.0{{- end }}'
pullPolicy: '{{ .Values.global.image_pullPolicy }}'
diff --git a/voltha-stack/Chart.yaml b/voltha-stack/Chart.yaml
index 4ded737..970662d 100644
--- a/voltha-stack/Chart.yaml
+++ b/voltha-stack/Chart.yaml
@@ -28,7 +28,7 @@
name: voltha-stack
appVersion: "1.0"
-version: 0.1.2
+version: 0.1.3
dependencies:
- name: voltha
@@ -36,8 +36,8 @@
version: 2.8.1
condition: voltha.enabled
- name: voltha-adapter-openonu
- repository: https://charts.opencord.org
- version: 2.7.3
+ repository: file://../voltha-adapter-openonu
+ version: 2.7.5
condition: voltha-adapter-openonu.enabled
- name: voltha-adapter-openolt
repository: https://charts.opencord.org
diff --git a/voltha-stack/values.yaml b/voltha-stack/values.yaml
index 98ad5e9..0574d6c 100644
--- a/voltha-stack/values.yaml
+++ b/voltha-stack/values.yaml
@@ -53,14 +53,11 @@
services:
kafka:
adapter:
- service: "{{ .Values.global.voltha_infra_name }}-kafka.{{ .Values.global.voltha_infra_namespace }}.svc"
- port: 9092
+ address: "{{ .Values.global.voltha_infra_name }}-kafka.{{ .Values.global.voltha_infra_namespace }}.svc:9092"
cluster:
- service: "{{ .Values.global.voltha_infra_name }}-kafka.{{ .Values.global.voltha_infra_namespace }}.svc"
- port: 9092
+ address: "{{ .Values.global.voltha_infra_name }}-kafka.{{ .Values.global.voltha_infra_namespace }}.svc:9092"
etcd:
- service: "{{ .Values.global.voltha_infra_name }}-etcd.{{ .Values.global.voltha_infra_namespace }}.svc"
- port: 2379
+ address: "{{ .Values.global.voltha_infra_name }}-etcd.{{ .Values.global.voltha_infra_namespace }}.svc:2379"
tracing_agent:
address: "{{ .Values.global.voltha_infra_name }}-voltha-tracing-jaeger-agent.{{ .Values.global.voltha_infra_namespace }}.svc:6831"