[VOL-3630] Configuring rw-core and open-onu-go topic for multistack support
Change-Id: Ia0e480ef6fe3e1771bbeb265820c34c194b796f5
diff --git a/voltha-adapter-openonu/Chart.yaml b/voltha-adapter-openonu/Chart.yaml
index 89d0331..deff1ee 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.1-dev"
+version: "2.6.2"
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 56c39e0..59b7fed 100644
--- a/voltha-adapter-openonu/templates/openonu-go-deploy.yaml
+++ b/voltha-adapter-openonu/templates/openonu-go-deploy.yaml
@@ -69,7 +69,7 @@
{{- end }}
containers:
- name: adapter-open-onu
- image: '{{ tpl .Values.images.adapter_open_onu.registry . }}{{ tpl .Values.images.adapter_open_onu_go.repository . }}:{{ tpl ( tpl .Values.images.adapter_open_onu_go.tag . ) . }}'
+ image: '{{ tpl .Values.images.adapter_open_onu_go.registry . }}{{ tpl .Values.images.adapter_open_onu_go.repository . }}:{{ tpl ( tpl .Values.images.adapter_open_onu_go.tag . ) . }}'
imagePullPolicy: {{ tpl .Values.images.adapter_open_onu_go.pullPolicy . }}
env:
- name: COMPONENT_NAME
@@ -84,8 +84,8 @@
- "--kafka_adapter_port={{ .Values.services.kafka.adapter.port }}"
- "--kafka_cluster_host={{ .Values.services.kafka.cluster.service }}"
- "--kafka_cluster_port={{ .Values.services.kafka.cluster.port }}"
- - "--core_topic=rwcore"
- - "--adapter_topic=brcm_openomci_onu"
+ - "--core_topic={{ .Values.defaults.topics.core_topic }}"
+ - "--adapter_topic={{ .Values.defaults.topics.adapter_open_onu_topic }}"
- "--olt_adapter_topic={{ .Values.defaults.topics.adapter_open_olt_topic }}"
- "--kv_store_host={{ .Values.services.etcd.service }}"
- "--kv_store_port={{ .Values.services.etcd.port }}"
diff --git a/voltha-adapter-openonu/values.yaml b/voltha-adapter-openonu/values.yaml
index c4789b6..6b264d5 100644
--- a/voltha-adapter-openonu/values.yaml
+++ b/voltha-adapter-openonu/values.yaml
@@ -71,6 +71,7 @@
tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}2.5.0{{- end }}{{- else }}2.5.0{{- end }}'
pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
adapter_open_onu_go:
+ registry: '{{ .Values.defaults.image_registry }}'
repository: '{{ .Values.defaults.image_org }}voltha-openonu-adapter-go'
tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}master{{- end }}{{- else }}master{{- end }}'
pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'