[SEBA-390]
Make the kafka k8s release name configurable in VOLTHA for logging
Change-Id: If40722d11c8ccb33b6850f74f82aef27ac28aabf
diff --git a/voltha/templates/_helpers.tpl b/voltha/templates/_helpers.tpl
index 46046c3..12d1cbb 100644
--- a/voltha/templates/_helpers.tpl
+++ b/voltha/templates/_helpers.tpl
@@ -49,7 +49,7 @@
kafka:
class: kafkaloghandler.KafkaLogHandler
bootstrap_servers:
- - "cord-kafka.default:9092"
+ - "{{ .KafkaServer }}"
topic: "voltha.log.{{ .KafkaTopic }}"
loggers:
diff --git a/voltha/templates/logconfigmaps.yaml b/voltha/templates/logconfigmaps.yaml
index 01ec31f..62e8109 100644
--- a/voltha/templates/logconfigmaps.yaml
+++ b/voltha/templates/logconfigmaps.yaml
@@ -20,7 +20,7 @@
serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
data:
logconfig: |
-{{- $data := dict "KafkaTopic" "vcore" "loglevel" .Values.loglevel }}
+ {{- $data := dict "KafkaServer" (printf "%s.default:9092" .Values.kafkaReleaseName) "KafkaTopic" "vcore" "loglevel" .Values.loglevel }}
{{ include "logconfig.yml" $data | indent 4 }}
---
@@ -32,7 +32,7 @@
serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
data:
logconfig: |
-{{- $data := dict "KafkaTopic" "netconf" "loglevel" .Values.loglevel }}
+{{- $data := dict "KafkaServer" (printf "%s.default:9092" .Values.kafkaReleaseName) "KafkaTopic" "netconf" "loglevel" .Values.loglevel }}
{{ include "logconfig.yml" $data | indent 4 }}
---
@@ -44,5 +44,5 @@
serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
data:
logconfig: |
-{{- $data := dict "KafkaTopic" "ofagent" "loglevel" .Values.loglevel }}
+{{- $data := dict "KafkaServer" (printf "%s.default:9092" .Values.kafkaReleaseName) "KafkaTopic" "ofagent" "loglevel" .Values.loglevel }}
{{ include "logconfig.yml" $data | indent 4 }}
diff --git a/voltha/values.yaml b/voltha/values.yaml
index ee2f720..3aa83fd 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -54,7 +54,6 @@
kafkaReleaseName: cord-kafka
etcdReleaseName: etcd-cluster
-
loglevel: "DEBUG"
images: