kafka integration helm changes
Change-Id: Ie85c9b11dcddc0191ecc3a04d220daa5760105af
diff --git a/voltha-go-controller/Chart.yaml b/voltha-go-controller/Chart.yaml
index 9d4c87e..52c255b 100644
--- a/voltha-go-controller/Chart.yaml
+++ b/voltha-go-controller/Chart.yaml
@@ -16,4 +16,4 @@
appVersion: "1.0"
description: A Helm chart for Kubernetes
name: voltha-go-controller
-version: 0.1.2
+version: 0.1.3
diff --git a/voltha-go-controller/templates/deployment.yaml b/voltha-go-controller/templates/deployment.yaml
index ff62ea6..3101724 100644
--- a/voltha-go-controller/templates/deployment.yaml
+++ b/voltha-go-controller/templates/deployment.yaml
@@ -49,7 +49,7 @@
- name: KV_STORE_PORT
value: "6379"
- name: KAFKA_ADAPTER_HOST
- value: "internal-kafka-headless.{{ .Values.global.voltha_infra_namespace }}.svc.cluster.local"
+ value: "{{ tpl .Values.services.kafka.cluster.address . }}"
- name: KAFKA_ADAPTER_PORT
value: "9092"
- name: LOG_LEVEL
diff --git a/voltha-go-controller/values.yaml b/voltha-go-controller/values.yaml
index ce9fe7a..63d5ccc 100644
--- a/voltha-go-controller/values.yaml
+++ b/voltha-go-controller/values.yaml
@@ -103,3 +103,9 @@
tolerations: []
affinity: {}
+
+# Define connectivity to required services
+services:
+ kafka:
+ cluster:
+ address: kafka:9092
diff --git a/voltha-stack/Chart.yaml b/voltha-stack/Chart.yaml
index eb56310..5a8e25a 100644
--- a/voltha-stack/Chart.yaml
+++ b/voltha-stack/Chart.yaml
@@ -26,14 +26,12 @@
email: "info@opennetworking.org"
url: "https://www.opennetworking.org"
name: voltha-stack
-
-appVersion: "2.11"
-version: 2.11.1
-
+appVersion: "2.12"
+version: 2.12.0
dependencies:
- name: voltha
repository: file://../voltha
- version: 2.11.7
+ version: 2.12.0
condition: voltha.enabled
- name: voltha-adapter-openonu
repository: file://../voltha-adapter-openonu
@@ -45,5 +43,5 @@
condition: voltha-adapter-openolt.enabled
- name: voltha-go-controller
repository: file://../voltha-go-controller
- version: 0.1.2
+ version: 0.1.3
condition: voltha-go-controller.enabled
diff --git a/voltha-stack/values.yaml b/voltha-stack/values.yaml
index cac4667..d4daa2e 100644
--- a/voltha-stack/values.yaml
+++ b/voltha-stack/values.yaml
@@ -76,3 +76,7 @@
voltha-go-controller:
enabled: false
+ services:
+ kafka:
+ cluster:
+ address: "{{ .Values.global.voltha_infra_name }}-kafka.{{ .Values.global.voltha_infra_namespace }}.svc:9092"
diff --git a/voltha-tracing/Chart.yaml b/voltha-tracing/Chart.yaml
index a65a23b..96a8902 100644
--- a/voltha-tracing/Chart.yaml
+++ b/voltha-tracing/Chart.yaml
@@ -14,7 +14,7 @@
---
apiVersion: v1
name: "voltha-tracing"
-version: "1.0.2"
+version: "1.0.3"
description: "A Helm chart for deploying Jaeger all-in-one container for Trace data collection and analysis"
keywords:
- "onf"
diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index adf0de8..6352596 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -14,7 +14,7 @@
---
apiVersion: "v1"
name: "voltha"
-version: "2.11.7"
+version: "2.12.0"
description: "A Helm chart for Voltha based on K8S resources in Voltha project"
keywords:
- "onf"
@@ -33,4 +33,4 @@
# app version applies to multiple components with potentially different
# container image versions
-appVersion: "2.11"
+appVersion: "2.12"